test
Merge branch 'master' of https://github.com/morocarlo/TestAPKSol

Conflicts:
	TestAPKSol/www/js/whohack.js