Menu page UI update
Merge branch 'develop' of https://github.com/HummingBirdSystem/emenu_android_client into develop

Conflicts:
	app/src/main/res/layout/activity_menu.xml
	app/src/main/res/values/strings.xml