fixed menu view
Merge remote-tracking branch 'origin/menu_view'

Conflicts:
	res/layout/menu_view.xml
	res/values/strings.xml
Merge and conflicts