Merge pull request #15 from agricocb/master

Moved the Menu and Filter buttons out of the mapView so that they remain visible
Merge pull request #17 from agricocb/master

Added the SettingsViewController object and a few settings on the story board
Merge pull request #18 from agricocb/master

Moved the new icons around in the repository hierarchy
Merge pull request #19 from agricocb/master

Unexpected fix/re-write of the POI marker info view bubbles and POI Detail View scene
Merge pull request #20 from agricocb/master

A bunch of code clean-up, infrastructure enhancements, and tying of loose ends
Merge pull request #22 from agricocb/master

Auto-size fixes for the map
Menu View Controller

Empty .m and .h files to eventually get the calling functionality
attached to
Revert "Menu View Controller"

This reverts commit aab832c14d88522cd544dd23878e6aafea8e0316.
Merge branch 'master' of github.com:BarreForestGuide/iOS-app
About page nav controller

minor fix to get nav controller to about page and back again
Merge pull request #23 from graceahmed/master

About view nav fix
Merge remote-tracking branch 'remotes/upstream/master'