fix asiayo.js
Merge branch 'cleanup' into develop
fix conflict
Conflicts:
	js/asiayo.js
fix asiayo.js