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

Conflicts:
	ProjectTaps/WebContent/WEB-INF/struts-config.xml