Fixed a bug where it would not compile on windows and fixed the androidBackButton callback to pass in state
Fixed bug with paths containing .. and .
Merge branch 'upstream/development'

Conflicts:
	engine/compilers/android/jni/Android.mk