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

Conflicts:
	utils.js