fixing mass assignment (refs: #318)
Merge remote-tracking branch 'origin/dev' into dev
fixing mass assignment (refs: #318)
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev