Binaries fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/SAVANT.apk
	bin/dexedLibs/android-support-v4-0c8c4a48d7c691449d34b6f42a46a66e.jar

	bin/dexedLibs/android-support-v7-appcompat-0253a3cb2e3384907b4564cddb8e01a9.jar

	bin/dexedLibs/android-support-v7-appcompat-ba5f4f505f1604de73ee19bc7b013e2b.jar
	bin/resources.ap_