small fixes emigrant logic
android gl impl comment java wait event. add select gl version on sdl_engine.cpp
game small refactoring
refactoring Picture class.
fix logo.cpp conflict
Merge branch 'master' into android-build
fix conficts android-build