diff --git a/.gitignore b/.gitignore
index 3a81b534411e..7c790a46b223 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /app/config/staging
 /app/config/development
 /app/config/fortrabbit
+/app/config/ubuntu
 /app/config/packages/anahkiasen/rocketeer/
 /app/storage
 /public/logo
@@ -13,4 +14,6 @@ composer.phar
 .DS_Store
 Thumbs.db
 app.yaml
-database.sql
\ No newline at end of file
+database.sql
+ninja.sublime-project
+ninja.sublime-workspace
\ No newline at end of file
diff --git a/app/routes.php b/app/routes.php
index 44960731817f..d4048b4d54d7 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -61,7 +61,6 @@ Route::get('/', function() {
 
 Route::get('/rocksteady', 'HomeController@showWelcome');
 
-
 Route::get('log_error', 'HomeController@logError');
 Route::post('get_started', 'AccountController@getStarted');
 
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index d9918069d51d..c75a29eb0d3f 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -608,7 +608,7 @@
 		if (!doc) return;
 		var string = doc.output('datauristring');
 
-		if (isFirefox || isChrome) {
+		if (isFirefox || (isChrome && !isChromium)) {
 			$('#theFrame').attr('src', string).show();		
 		} else {			
 			if (isRefreshing) {
diff --git a/app/views/invoices/view.blade.php b/app/views/invoices/view.blade.php
index 9b13dee2abe3..60d39acc7415 100755
--- a/app/views/invoices/view.blade.php
+++ b/app/views/invoices/view.blade.php
@@ -38,7 +38,7 @@
 			if (!doc) return;
 			var string = doc.output('datauristring');
 			
-			if (isFirefox || isChrome) {
+			if (isFirefox || (isChrome && !isChromium)) {
 				$('#theFrame').attr('src', string).show();
 			} else {
 				var pdfAsArray = convertDataURIToBinary(string);	
diff --git a/bower.json b/bower.json
index 36422efc4e1f..04ef694a7165 100755
--- a/bower.json
+++ b/bower.json
@@ -17,5 +17,8 @@
     "typeahead.js": "~0.9.3",
     "accounting": "~0.*",
     "pdfjs": "*"
+  },
+  "resolutions": {
+    "jquery": "~1.*"
   }
 }
diff --git a/public/js/script.js b/public/js/script.js
index 171a926ece8e..ec24efb14b52 100755
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -3,8 +3,8 @@ var isOpera = !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
 var isFirefox = typeof InstallTrigger !== 'undefined';   // Firefox 1.0+
 var isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0;
 var isChrome = !!window.chrome && !isOpera;              // Chrome 1+
+var isChromium = isChrome && navigator.userAgent.indexOf('Chromium') >= 0;
 var isIE = /*@cc_on!@*/false || !!document.documentMode; // At least IE6
-
 var NINJA = {};
 
 function generatePDF(invoice, checkMath) {