2014-8-28 linyb 代码合并
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebRoot/WEB-INF/view/sys/authority/user/query.jsp