* use master func
Merge branch 'master' into dev

Conflicts:
	app.js
	utils.js