Adding a State on UO objects (refs: #636)
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev