modified:   src/main/java/com/tekusource/sabongpro/controller/AdminController.java
	modified:   src/main/java/com/tekusource/sabongpro/controller/LoginController.java
	modified:   src/main/java/com/tekusource/sabongpro/service/UserService.java
	modified:   src/main/java/com/tekusource/sabongpro/service/impl/UserServiceImpl.java
Merge branch 'master' of https://github.com/jntcinco/sabongpro
	renamed:    src/main/java/com/tekusource/sabongpro/util/SabongProConstants.java -> src/main/java/com/tekusource/sabongpro/constants/SabongProConstants.java
	modified:   src/main/java/com/tekusource/sabongpro/controller/AdminController.java
	modified:   src/main/java/com/tekusource/sabongpro/controller/GuestController.java
	modified:   src/main/java/com/tekusource/sabongpro/controller/LoginController.java
	modified:   src/main/java/com/tekusource/sabongpro/dao/UserDao.java
	modified:   src/main/java/com/tekusource/sabongpro/dao/impl/GenericDaoImpl.java
	modified:   src/main/java/com/tekusource/sabongpro/dao/impl/UserDaoImpl.java
	modified:   src/main/java/com/tekusource/sabongpro/model/UserProfile.java
	modified:   src/main/java/com/tekusource/sabongpro/service/UserService.java
	modified:   src/main/java/com/tekusource/sabongpro/service/impl/UserServiceImpl.java
	new file:   src/main/java/com/tekusource/sabongpro/util/CommonUtil.java
	modified:   src/main/resources/security.properties
	modified:   src/main/webapp/WEB-INF/jsp/livestreaming.jsp
	modified:   src/main/webapp/WEB-INF/jsp/register.jsp
	modified:   src/main/webapp/WEB-INF/jsp/userManagement.jsp
Added update to code