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

Conflicts:
	TaburuPPB/bin/TaburuPPB.apk
	TaburuPPB/bin/classes.dex
	TaburuPPB/bin/classes/com/taburuppb/Home$1.class
	TaburuPPB/bin/classes/com/taburuppb/Home$2.class
	TaburuPPB/bin/classes/com/taburuppb/Home.class
	TaburuPPB/bin/resources.ap_
Merge branch 'master' of https://github.com/aarefandi92/Taburu

Conflicts:
	TaburuPPB/bin/TaburuPPB.apk
	TaburuPPB/bin/classes.dex
	TaburuPPB/bin/classes/com/taburuppb/Home.class
	TaburuPPB/src/com/taburuppb/Home.java