Menu now integrated with ActionBar

preferences are accessed by the 3... menu