merge request #16

Changed the button color to be orange when pressed.

Fixed the up button in the action bar. It now called an intent to main rather than use navutils.