some changes
Merge branch 'master' of https://github.com/jokagent/masterdelo

Conflicts:
	app.js
push push