Change the id of the textview
Merge branch 'master' of https://github.com/weiweizh/dinnerplanner-android

Conflicts:
	res/values/strings.xml