updates

2 files changed, 21 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e1adbd6..6ea27557 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## [Unreleased](https://github.com/pliablepixels/zmNinja/tree/HEAD)
+
+[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v0.84...HEAD)
+
+**Implemented enhancements:**
+
+- offer an option to force web sockets even if push is supported [\#53](https://github.com/pliablepixels/zmNinja/issues/53)
+- customize screen to load on push notification tap [\#47](https://github.com/pliablepixels/zmNinja/issues/47)
+
+**Fixed bugs:**
+
+- Swiping to the left should reveal next monitor, not prev monitor \(seen on iOS 9\) [\#51](https://github.com/pliablepixels/zmNinja/issues/51)
+
 ## [v0.84](https://github.com/pliablepixels/zmNinja/tree/v0.84) (2015-10-28)
 [Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v0.83...v0.84)
 
diff --git a/www/js/EventServer.js b/www/js/EventServer.js
index b74298c3..bde58e3e 100644
--- a/www/js/EventServer.js
+++ b/www/js/EventServer.js
@@ -336,16 +336,19 @@ angular.module('zmApp.controllers')
     {
         ZMDataModel.zmLog ("Setting up push registration");
         var push;
-        
-        var src = "sounds/blop.mp3";
-        var media = $cordovaMedia.newMedia(src);
+        var mediasrc;
+        var media;
         
         
         var plat = $ionicPlatform.is('ios') ? 'ios':'android';
         
         
+        
+         
+        
         if (plat == 'ios')
         {
+            mediasrc = "sounds/blop.mp3";
             push = PushNotification.init(
                     
                      { "ios": 
@@ -359,6 +362,7 @@ angular.module('zmApp.controllers')
         }
         else
         {
+            mediasrc = "/android_asset/www/sounds/blop.mp3";
             push = PushNotification.init(
                     
                     { "android": 
@@ -371,7 +375,7 @@ angular.module('zmApp.controllers')
            
         }
 
-        
+        media = $cordovaMedia.newMedia(mediasrc);
        /* var push = PushNotification.init(
                     { "android": 
                      {"senderID":zm.gcmSenderId,