Merge pull request #111 from gitMbar/dev

Refactor rootscope data to controller, bind friends data to map scope, friends button swaps view
Implement infinite scroll with real data
Resolve merge conflicts
Merge pull request #112 from vreddy18/master

Implement infinite scroll with real user data
cleanup and refactor
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
refactor to create bidirectional friend relationships when storing a user for the first time
Merge pull request #113 from atungare/dev

refactor friends' data
Clicking a friend will add their data to the map
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev