测试
Merge branch 'master' of https://github.com/silentwu/coachTrip

Conflicts:
	web/src/main/webapp/index.jsp
	webapp/src/main/webapp/WEB-INF/app/bower.json
	webapp/src/main/webapp/index.html
	webapp/src/main/webapp/index.jsp
路径修改