Integrated Joel's MenuActivity.java and XML edits with mine so they will
now work together.
Merge branch 'Kevin'