string
Merge branch 'master' of https://github.com/SpongeSoft/DietApp.git

Conflicts:
	res/values-v14/strings.xml