Merge remote-tracking branch 'origin/master'

Conflicts:
	appcompat_v7/bin/android-support-v7-appcompat.jar