Still trying to pull
Merge branch 'master' of https://github.com/joethered/clarp

Conflicts:
	appcompat_v7/bin/android-support-v7-appcompat.jar
	bin/R.txt
	res/values/strings.xml