去掉showUsers的maxPage
融合前提交
提交备份Merge branch 'master' of https://github.com/HCI-webdesigner/Dean

Conflicts:
	conf/application.conf