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

Conflicts:
	ProjectTaps/WebContent/Management.jsp
s
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/ibatis-cfg.xml
a
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/adins/ace/taps/action/LoginAction.java
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
insert organization jsp nya ganti dikit