Removing dead code and general cleansing: refs  #516
Merge branch 'dev' of github.com:projestimate/projestimate into dev