Attributes organisation  refs:#762
Merge branch 'dev' of github.com:estimancy/projestimate into dev