jj
Merge branch 'master' of https://github.com/hzjhw/UserManagement

Conflicts:
	app/modules/index/views/layout_left.html