revision
revision
Merge branch 'master' of https://github.com/futuhal-arifin/edoocatia

Conflicts:
	edoocatia-android/bin/classes/data/images/menu/bck_menu.png
	edoocatia-android/bin/classes/data/images/menu/spr_title_0.png
	edoocatia-desktop/bin/data/images/icon/music_and_sound/icon music off.png
	edoocatia-desktop/bin/data/images/icon/music_and_sound/icon music on.png
	edoocatia-desktop/bin/data/images/icon/music_and_sound/icon sound off.png
	edoocatia-desktop/bin/data/images/icon/music_and_sound/icon sound on.png
	edoocatia-desktop/bin/data/images/icon/right_and_wrong/benar.png
	edoocatia-desktop/bin/data/images/icon/right_and_wrong/salah.png
	edoocatia-desktop/bin/data/images/menu/char.png
	edoocatia-desktop/bin/data/images/menu/edoocatia-title-shine.png
	edoocatia-desktop/bin/data/images/menu/edoocatia-title.png
	edoocatia-desktop/bin/data/images/modul-1/lemari+perkakas/lemari.jpg