Merge branch 'dev' of https://github.com/gowaddle/waddle
Merge pull request #227 from byeo630/dev

Dev
Merge branch 'dev' of https://github.com/gowaddle/waddle
Merge pull request #228 from byeo630/dev

Add footprint styling.
Comment change
Merge branch 'dev' of https://github.com/gowaddle/waddle
Update to angular 1.3 and remove status fetching from userController because of fb API error
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
Implement aggregated feed for footprints from all user's friends
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
Merge pull request #232 from vreddy18/master

Serves up comment data to user feed
Add styling to footprint modal.