refs #656 - add mark and resolve bugs
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev