tidak tahu menahu
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/adins/ace/taps/action/LoginAction.java
ddd
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

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

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

Conflicts:
	ProjectTaps/src/ibatis-cfg.xml