Commit of string changes removing Shopping for merge conflict
Merge branch 'master' of https://github.com/crowmastr/munch.git

Conflicts:
	res/values/strings.xml