Minor bugfixes + timeout

-Added timeout while map is loading
-Some bugfixes on collisions
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	platforms/android/CordovaLib/ant-build/build.prop
	platforms/android/ant-build/HelloWorld-debug-unaligned.apk
	platforms/android/ant-build/HelloWorld-debug.apk
	platforms/android/ant-build/HelloWorld.ap_
	platforms/android/ant-build/build.prop