Merge remote-tracking branch 'Hyzual/master' into release-4.2.2

Conflicts:
	dist/scripts/scripts.min.90d06b68.js
	dist/styles/Style.33fecadd.css
	dist/styles/vendor.min.1b9c3888.css

Gruntfile.js

@@ -21,6 +21,10 @@ module.exports = function (grunt) {
     dist: 'dist'
   };
 
+  // Paths to ssh config & private key
+  var sshConfigFile = '.ssh/testServer.json';
+  var sshKeyFile = '.ssh/test-server-key/';
+
   // Define the configuration for all the tasks
   grunt.initConfig({
 
@@ -313,10 +317,10 @@ module.exports = function (grunt) {
     //    "password": 'include-only-if-not-using-private-key-below'
     // }
     sshconfig: {
-      testServer: grunt.file.readJSON('.ssh/testServer.json')
+      testServer: grunt.file.exists(sshConfigFile) ? grunt.file.readJSON('.ssh/testServer.json') : null
     },
     // This is the private key for the username on the host defined in testServer.json
-    testServerKey: grunt.file.read('.ssh/test-server-key'),
+    testServerKey: grunt.file.exists(sshKeyFile) ? grunt.file.read('.ssh/test-server-key') : null,
     // Removes everything at the deploy location to avoid filling up the server with revved files.
     sshexec: {
       cleanTest: {

app/index.html

@@ -123,8 +123,7 @@
             </div>
         </div>
     </div> <!-- End container -->
-    <!--<script>
-
+    <script>
         (function (i, s, o, g, r, a, m) {
             i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
                 (i[r].q = i[r].q || []).push(arguments)
@@ -134,8 +133,7 @@
 
         ga('create', 'UA-40174100-1', 'jamstash.com');
         ga('send', 'pageview');
-
-    </script>-->
+    </script>
     <!-- build:js({.,app}) scripts/vendor.min.js -->
     <!-- bower:js -->
     <script src="bower_components/jquery/jquery.js"></script>

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jamstash",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "HTML5 Audio Streamer for Subsonic, Archive.org browsing and streaming",
   "authors": [
     "tsquillario (https://github.com/tsquillario)",

manifest.json

@@ -2,7 +2,7 @@
 	"manifest_version": 2,
 	"name": "Jamstash",
 	"description": "HTML5 Player for Subsonic & Archive.org",
-	"version": "4.2.1",
+	"version": "4.2.2",
 	"app": {
 		"launch": {
 			"web_url": "http://jamstash.com"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jamstash",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "HTML5 Audio Streamer for Subsonic, Archive.org browsing and streaming",
   "author": "Trevor Squillario (https://github.com/tsquillario)",
   "contributors": [
@@ -46,9 +46,9 @@
     "grunt-usemin": "^2.6.0",
     "grunt-wiredep": "^1.9.0",
     "jshint-stylish": "^1.0.0",
-    "karma": "^0.12.24",
+    "karma": "^0.12.25",
     "karma-chrome-launcher": "^0.1.5",
-    "karma-jasmine": "^0.2.3",
+    "karma-jasmine": "^0.3.0",
     "karma-phantomjs-launcher": "^0.1.4",
     "load-grunt-tasks": "^1.0.0",
     "sellout": "0.0.1",