Merge commit 'f62363b5fe6c37ea97d84206947533cb6286b4c5' into devel

Conflicts:
	src/main/java/org/pshow/service/UserService.java
	src/main/webapp/app/controller/SystemManagement.js