Merge pull request #178 from vreddy18/master

UI improvements; merge conflict resolution; begin FB realtime fetching
Fix karma client unit tests; include masonry
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
Merge pull request #183 from gitMbar/dev

Fix karma client unit tests; include masonry
Clean and document userModel file
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
Merge pull request #184 from gitMbar/dev

Clean and document userModel file
uglify files for deployment
defend custom submit directive against uglification
resolve merge cofilct
configure watch properly
Merge pull request #185 from atungare/dev

Dev - devops fun
Clicking pictures will now link like names
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
fix masonry error in gruntfile
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
Change hover action of photo
Merge pull request #186 from gitMbar/dev

Clicking pictures will now link like names
Merge pull request #187 from atungare/dev

Dev - masonry bower
Fix merge conflicts...again