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

Conflicts:
	ProjectTaps/src/adins/ace/taps/action/LoginAction.java