Merge branch 'develop'

Conflicts:
	tests.perf.html

Author: Vlad Balin

tests.perf.html

@@ -39,11 +39,7 @@
                 mocha.setup( 'bdd' );
 
                 var search = window.location.search;
-<<<<<<< HEAD
-                require( [ 'tests/performance' ], function(){
-=======
                 require( [ 'performance' ], function(){
->>>>>>> origin/develop
                     mocha.run();
                 } );
             }