* use func dev
Merge branch 'master' into dev

Conflicts:
	app.js
* add lib folder