xiaoming chg app.js 03
Merge origin/master

Conflicts:
	src/main/webapp/Application.js
Merge origin/master

Conflicts:
	src/main/webapp/Application.js