add
Versi 01
Merge branch 'master' of https://github.com/leomastakusuma/myindo

Conflicts:
	application/modules/hcgs/forms/Karyawan.php
	application/modules/hcgs/models/DbTable/Karyawan.php
	nbproject/private/private.xml
Versi 01