Lupa nambah apaan... :v
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/adins/ace/taps/form/employee/EmployeeForm.java
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
Tambah edit, phto belum ditampilin
makmak
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/adins/ace/taps/ibatis/Employee-ibatis.xml
	ProjectTaps/src/adins/ace/taps/manager/EmployeeManager.java