Main Menu Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Carl_ProjectFiles/res/layout/activity_main_menu.xml