Test commit
Merge branch 'dev' of https://github.com/FWAJL/FieldWorkAssistantMVC into dev