update with new prototype (graphics update)
Merge branch 'master' of https://github.com/tkminh/djeeo

Conflicts:
	AndroidManifest.xml