Merge pull request #186 from FWAJL/dev

new Dev branch after conflict
Merge branch 'dev'
Merge from TaskUI branch
Merge branch 'dev'
Merge branch 'master' of https://github.com/FWAJL/FieldWorkAssistantMVC
bug fix after merge with Brian
Merge branch 'master' into dev