Merge pull request #100 from atungare/dev

Separate flow of data on first vs subsequent logins
Renders data from DB on map
Merge pull request #101 from vreddy18/master

Renders data from DB on map
Add facebook query for friends; merge friends into neo4j
Merge pull request #102 from gitMbar/dev

Add facebook query for friends; merge friends into neo4j
Modify markerCluster
Deliver friends data to client
Merge pull request #103 from gitMbar/dev

Deliver friends data to client
Combine database requests to optimize load time
Merge pull request #104 from gitMbar/dev

Combine database requests to optimize load time
Add route and logic to grab friend data
Merge pull request #105 from gitMbar/dev

Add route and logic to grab friend data
Add nav bar
getUserData function on client now retrieves checkin data for a given FbID
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
Merge pull request #106 from gitMbar/dev

getUserData function on client now retrieves checkin data for a given facebookID
change so deployed app can receive push notifications
refactor for heroku
Resolve merge conflicts
Merge pull request #108 from vreddy18/master

add nav bar and resolve merge conflicts