* use func master
Merge branch 'master' into dev

Conflicts:
	app.js
	lib/utils.js