Merge pull request #128 from gitMbar/dev

reload map view and controller on 'my map' click
Refactor FriendsController to use best practices
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev