expoit formating (refs: #590)
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev