Comment change
Merge branch 'dev' of https://github.com/gowaddle/waddle
Merge pull request #229 from vreddy18/master

update to angular 1.3 and remove fb status fetching to prevent login crash due to fb api error
Merge pull request #230 from vreddy18/master

Implement aggregated feed of all user and friend footprints
Comment change'
Merge branch 'dev' of https://github.com/gowaddle/waddle

Conflicts:
	bower.json
Add ability to delete comment
Merge pull request #231 from ashruti/master

Add ability to delete comment
Add socket.io to bower.json and package.json
Fix merge conflicts
Serves up comment data to individual feed