Merge branch 'master' of https://github.com/Fonserbc/dinnerplanner-android

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
Merge
Solved conflicts