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

Conflicts:
	WebRoot/WEB-INF/classes/com/synnex/cms/dao/UserDao.class
	WebRoot/WEB-INF/classes/struts.xml
	src/com/synnex/cms/dao/UserDao.java
	src/struts.xml