Merge remote-tracking branch 'origin/chat-osd' into chat-osd

.appveyor.yml

@@ -33,7 +33,7 @@ build: off
 artifacts:
   path: 'syncplay_v1.5.0'
   type: zip
-  name: Syncplay_win
+  name: Syncplay_chat-osd_win
 
 # Push artefact to S3 bucket and list all
 before_deploy:
@@ -46,9 +46,9 @@ deploy:
   username: alby128
   api_key:
     secure: lAocj5KA9Z9x4BefQBIgNlQJbeW4qPBfCgYVBHMyOP3NgyhnMLmvR57ZCqtCKBlQ
-  subject: alby128
+  subject: Syncplay
   repo: Syncplay
   package: Syncplay
-  version: "1.5.0"
+  version: "test"
   publish: true
   override: true

.travis.yml

@@ -3,7 +3,7 @@ osx_image: xcode6.4
 
 branches:
   only:
-  - master
+  - chat-osd
 
 script:
 - python buildPy2app.py py2app
@@ -22,10 +22,10 @@ before_deploy:
 - pip install dmgbuild
 - mkdir dist_dmg
 - mv resources/macos_vlc_install.command resources/.macos_vlc_install.command
-- dmgbuild -s appdmg.py "Syncplay" dist_dmg/Syncplay_macOS.dmg
+- dmgbuild -s appdmg.py "Syncplay" dist_dmg/Syncplay_chat-osd_macOS.dmg
 
 deploy:
-  on: master
+  on: chat-osd
   provider: bintray
   file: "bintray.json"
   user: alby128

bintray.json

@@ -2,11 +2,11 @@
     "package": {
         "name": "Syncplay",
         "repo": "Syncplay",
-        "subject": "alby128"
+        "subject": "syncplay"
     },
 
     "version": {
-        "name": "1.5.0"
+        "name": "test"
     },
 
     "files":