Merge branch 'master' into dev
Merge branch 'dev'
Merge remote-tracking branch 'origin/master'
Removed spring's log4j configurer and the autologger jndi setup from web.xml
Switched over to logback for logging.

This removed any further need for filter properties or profiles in maven.
Logging is configured by external properties file.