commit sementara
Merge branch 'master' of https://github.com/futuhal-arifin/edc

Conflicts:
	edoocatia-android/bin/classes.dex
	edoocatia-android/bin/edoocatia-android.apk
	edoocatia-android/bin/res/crunch/drawable-hdpi/splash_screen.png
	edoocatia-android/bin/resources.ap_