page
Merge branch 'add_template' of https://github.com/Zuohr/flweekr.git into
add_template

Conflicts:
	flweekr/WebContent/WEB-INF/city.jsp