irul
Merge branch 'master' of https://github.com/aagusti/e-gaji

Conflicts:
	egaji/views/templates/egaji/potongan/add.pt
Merge branch 'master' of https://github.com/aagusti/e-gaji