..
Merge branch 'master' of https://github.com/aarefandi92/Taburu

Conflicts:
	TaburuPPB/bin/classes/com/taburuppb/DetilDiklat.class
	TaburuPPB/bin/classes/com/taburuppb/GlobalVariables.class
	TaburuPPB/bin/classes/com/taburuppb/Home$1.class
	TaburuPPB/bin/classes/com/taburuppb/Home$2.class
	TaburuPPB/bin/classes/com/taburuppb/Home$3.class
	TaburuPPB/bin/classes/com/taburuppb/Home$4.class
	TaburuPPB/bin/classes/com/taburuppb/Home.class
	TaburuPPB/bin/classes/com/taburuppb/ItemListBaseAdapter$ViewHolder.class
	TaburuPPB/bin/classes/com/taburuppb/ItemListBaseAdapter.class
	TaburuPPB/bin/classes/com/taburuppb/MainActivity.class
	TaburuPPB/bin/classes/com/taburuppb/R$id.class
	TaburuPPB/bin/classes/com/taburuppb/R$layout.class
	TaburuPPB/bin/classes/com/taburuppb/R$menu.class
	TaburuPPB/bin/classes/com/taburuppb/R$string.class
	TaburuPPB/bin/classes/com/taburuppb/R$style.class
	TaburuPPB/bin/classes/com/taburuppb/business/DiklatHelper.class
	TaburuPPB/bin/classes/com/taburuppb/business/HardCodedDataSource.class
	TaburuPPB/bin/classes/com/taburuppb/entities/Diklat.class
	TaburuPPB/bin/classes/com/taburuppb/entities/Kelas.class
	TaburuPPB/bin/classes/com/taburuppb/entities/MateriDiklat.class
	TaburuPPB/bin/classes/com/taburuppb/entities/Pengguna.class
	TaburuPPB/bin/classes/com/taburuppb/entities/TopikDiklat.class