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

Conflicts:
	jni/engine/polygon.h
	jni/engine/sprite.h
	jni/ft/ftsplashscreen.cpp