Signed-off-by: ghuazh <ghuazh@gmail.com>
Merge branch 'master' of https://github.com/sgewuhan/PM2.git

Conflicts:
	com.sg.business.model/src/com/sg/business/model/Role.java
	com.sg.business.model/src/com/sg/business/model/User.java