General improvements
Merge branch 'Development' of http://github.com/FWAJL/FieldWorkAssistantMVC into Development