Signed-off-by: dongamp1990 <dongamp1990@gmail.com>
2014/06/13
Merge branch 'master' of https://github.com/dongamp1990/BasePJ

Conflicts:
	WebContent/WEB-INF/jsp/server/privilege/privilege.jsp