wizard 70%
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/WebContent/WEB-INF/jsp/project/transferProject.jsp
	ProjectTaps/WebContent/js/other/formToWizard.js
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
comat camit
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/WebContent/css/style.css
	ProjectTaps/src/adins/ace/taps/bean/project/StructureProjectBean.java