add the note for method
12:30 13:01
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/synnex/cms/action/UserManageAction.java
	src/com/synnex/cms/daoImpl/ApplyDaoImpl.java
	src/com/synnex/cms/daoImpl/ClubDaoImpl.java
	src/com/synnex/cms/daoImpl/UserDaoImpl.java
	src/com/synnex/cms/serviceImpl/ApplyServiceImpl.java
	src/com/synnex/cms/serviceImpl/ClubServiceImpl.java
	src/com/synnex/cms/serviceImpl/UserServiceImpl.java
	src/struts.xml