nambah assignment
Merge branch 'master' of https://github.com/budisant/ProjectStruts.git

Conflicts:
	ProjectTaps/WebContent/WEB-INF/classes/adins/ace/taps/action/EmployeeReportAction.class
	ProjectTaps/WebContent/WEB-INF/classes/adins/ace/taps/action/NewAssignmentAction.class
	ProjectTaps/WebContent/WEB-INF/classes/adins/ace/taps/ibatis/Assignment-ibatis.xml
	ProjectTaps/WebContent/WEB-INF/classes/ibatis-cfg.xml
	ProjectTaps/WebContent/WEB-INF/struts-config.xml
	ProjectTaps/src/ibatis-cfg.xml