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

Conflicts:
	edoocatia/bin/id/ac/ui/edoocatia/Edoocatia.class
	edoocatia/bin/id/ac/ui/edoocatia/util/ScreenEnum$1.class
	edoocatia/bin/id/ac/ui/edoocatia/util/ScreenEnum$2.class
	edoocatia/bin/id/ac/ui/edoocatia/util/ScreenEnum$3.class
	edoocatia/bin/id/ac/ui/edoocatia/util/ScreenEnum.class