restart
Merge branch 'master' of https://github.com/Metallhero/Moca

Conflicts:
	www/assets/plugins/jquery-1.10.2.min.js
	www/assets/scripts/site.manage.js
	www/assets/scripts/test_result.manage.js
	www/test_11_2.html
	www/test_13_2.html