for quentin
Merge branch 'master' of https://github.com/dsarkozi/Gourmet.git

Conflicts:
	res/values/strings.xml