Merge pull request #297 from FWAJL/dev

dev to feature
Merge pull request #299 from FWAJL/feature_tasktab_technicians

Merge pull request #297 from FWAJL/dev