j
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS

Conflicts:
	ProjectTaps/WebContent/WEB-INF/struts-config.xml
	ProjectTaps/src/adins/ace/taps/ibatis/Assignment-ibatis.xml