Merge branch 'changes' into develop

scripts/src/glitch.js

@@ -1,6 +1,6 @@
 /*global define*/
 define(
-	[ 'aux/canvas' ],
+	[ 'util/canvas' ],
 	function( canvas_helper )
 	{
 		var canvas = document.createElement( 'canvas' );

scripts/src/main.js

@@ -20,7 +20,7 @@ require(
 		'src/controls',
 		'src/export-png',
 		'src/save-button',
-		'aux/feature-test',
+		'util/feature-test',
 		'lib/signals-1.0.0',
 		'lib/html5slider'
 	],

scripts/src/process.js

@@ -1,6 +1,6 @@
 /*global define, requestAnimationFrame*/
 define(
-	[ 'aux/glitch', 'aux/canvas', 'lib/raf' ],
+	[ 'src/glitch', 'util/canvas', 'lib/raf' ],
 	function( glitch, canvas_helper )
 	{
 		var tmp_canvas = document.createElement( 'canvas' );