Merge branch 'Development'
Merge branch 'master' of https://github.com/FWAJL/FieldWorkAssistantMVC
Merge branch 'master' of https://github.com/FWAJL/FieldWorkAssistantMVC
Merge branch 'master' of https://github.com/FWAJL/FieldWorkAssistantMVC
Merge branch 'master' of https://github.com/FWAJL/FieldWorkAssistantMVC
Cleaning up code