WBS-Activity-Elements #316 - Actibity Element bugs resolved (in part)
Merge branch 'dev' of github.com:projestimate/projestimate into dev