fixing few best practices issues (refs: #318)
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev