Merge pull request #192 from FWAJL/master

master to dev
Merge branch 'master' into dev
Issue #194

Starting the dev work
Merge branch 'dev' of https://github.com/FWAJL/FieldWorkAssistantMVC into dev
Merge pull request #195 from FWAJL/dev

Merge