page
Before pull.
Merge branch 'master' of https://github.com/bingluo/survey.git

Conflicts:
	survey/src/cn/edu/seu/cse/survey/controller/PageController.java