Update site config properties
upgraded to spring 3.2.8.RELEASE from 3.0.3.RELEASE
changed spring xsd to 3.2 schema
adding angularjs resources
Updates to mapper libraries, marshalling/unmarshalling strategy, and added more autowiring
Combined Jason's integration testing changes to one commit, didn't include Spring upgrade
Modification of test context
Autowiring/simplification effort
Further simplifying test context
Merge branch 'master' of https://github.com/USM-RCG/openhds-server

Conflicts resolved:
	task/src/main/resources/META-INF/spring/taskContext.xml
	web/src/main/resources/META-INF/spring/application-context.xml