12/24 11:17
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebRoot/WEB-INF/classes/applicationContext.xml
	WebRoot/WEB-INF/classes/com/synnex/cms/dao/UserDao.class
	WebRoot/WEB-INF/classes/com/synnex/cms/service/UserService.class
	src/applicationContext.xml