Merge origin/master

Conflicts:
	platforms/android/CordovaLib/ant-build/build.prop
	platforms/android/ant-build/build.prop
	platforms/android/ant-build/tracker-debug-unaligned.apk
	platforms/android/ant-build/tracker-debug.apk
	platforms/android/ant-build/tracker.ap_
	platforms/android/assets/www/index.html