* use dev func
Merge branch 'master' into dev

Conflicts:
	app.js
	utils.js
* use dev func
Merge branch 'master' into dev

Conflicts:
	app.js
	utils.js