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