Commits

Merge branch 'develop' into multiuser * develop: MTG-23: Updated tests to use Java configuration. MTG-23: Updated web.xml to use Java configuration. Renamed configuration file to avoid naming collision with Spring annotation. MTG-23: Replaced Spring XML configuration with Java Configuration.