Fixing GUI and translation issues (refs: #485)
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev