Menambahkan Comment koding
Sync
Menambahkan Comment koding
Merge branch 'master' of https://github.com/yogiekurniawan/JayaMekar

Conflicts:
	app/scripts/controllers/about-app.js
	app/scripts/controllers/about-me.js
	app/scripts/controllers/jabatan.js
	app/scripts/controllers/karyawan.js
	app/scripts/controllers/rumus-gaji-karyawan-harian.js
	app/scripts/controllers/rumus-gaji-karyawan-tenun.js
	app/scripts/controllers/rumus-gaji.js
	app/scripts/controllers/transaksi-karyawan-harian.js
	app/scripts/controllers/transaksi-karyawan-tenun.js
	app/scripts/controllers/transaksi.js
	app/scripts/services/indexeddb.js