Merge branch 'master' of github.com:NicolasPetton/amber

Conflicts:
	js/amber.js

js/amber.js

@@ -205,8 +205,12 @@ amber = (function() {
 	};
 
 	function loadJSViaJQuery(url, callback) {
-		$.ajaxSetup({cache: true});
-		$.getScript(jsToLoad[0], callback);
+		$.ajax({
+			dataType: "script",
+			url: jsToLoad[0],
+			cache: deploy,
+			success: callback
+		});
 	};
 
 	function writeScriptTag(src) {