2nd code push
Merge branch 'master' of github.com:typhonrt/modern-java6-android-glframework