EasonDemo
a
Merge branch 'master' of https://github.com/PhoenixJohnson/Manner-Webapp

Conflicts:
	web/ui/js/app.js