Merge branch 'master' into together
zuruek button position change
minor tweaks, displayMode, menu
Merge branch 'firstmenu'
minor