Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

composer.json

@@ -59,7 +59,7 @@
         "roave/security-advisories": "dev-master",
         "simshaun/recurr": "dev-master",
         "symfony/css-selector": "~3.1",
-        "turbo124/laravel-push-notification": "2.*",
+        "davibennun/laravel-push-notification": "dev-laravel5",
         "webpatser/laravel-countries": "dev-master#75992ad",
         "websight/l5-google-cloud-storage": "dev-master",
         "wepay/php-sdk": "^0.2",

config/push-notification.php

@@ -17,7 +17,7 @@ return [
     'ninjaAndroid' => [
         'environment' =>'production',
         'apiKey'      =>env('FCM_API_TOKEN'),
-        'service'     =>'fcm'
+        'service'     =>'gcm'
     ]
 
 ];