Merge branch 'master' of https://github.com/MisterSpicy/crunchytech

Conflicts:
	breeze/res/drawable-hdpi/picture_and_location.9.png
	breeze/res/drawable-mdpi/picture_and_location.9.png
	breeze/res/drawable-xhdpi/picture_and_location.9.png
	breeze/res/drawable-xxhdpi/picture_and_location.9.png
fix conflict