1
Merge branch 'master' of https://github.com/alzhuravlev/funnytowers-android

Conflicts:
	jni/android_main.cpp
	jni/engine/renderer.h