15.31
21315645654
Merge branch 'master' of https://github.com/synnex123/teamwork.git

Conflicts:
	WebRoot/WEB-INF/classes/applicationContext.xml
	WebRoot/WEB-INF/classes/com/synnex/cms/dao/UserDao.class
	WebRoot/updatemyinfo.jsp
	src/applicationContext.xml
	src/com/synnex/cms/dao/ClubDao.java
	src/com/synnex/cms/service/ClubService.java