Merge pull request #15 from snorham/master

giving the inventory activity an up button that returns user to the main activity
removing inventory button from mapfragment