Re-factor ng-if statement to fix feed photo display
Merge pull request #239 from vreddy18/master

Re-factor ng-if statement to fix feed photo display
Add user profile data to template in upper left corner
Merge pull request #240 from vreddy18/master

Add user profile data to template in upper left corner
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
Fix placement for checkin and photo modal.