Merge branch 'cleanup' into develop

Conflicts:
	js/asiayo.js
so manny conlict