Update pom to use nla-deploy profile for deployment
Update spring config to use properties with loading order
Remove unsed spring config files
Configure copy plugin to rename the properties file
Updated the properties for DOCWORKS
Merge branch 'master' into settings
Fixed broken test.
Fixed runtime issue where spring can't inject properties into static variables for the DocworksUtils class
Few tab/spacing/formatting issues

</pedantry>
Merge branch 'master' into huw-upload

Conflicts:
	src/banjo/models/JobRecord.java