Update applicationContext
Merge branch 'master' of
https://github.com/thysmichels/force.com-swagger-rest-spring-mvc-heroku

Conflicts:
	src/main/resources/applicationContext.xml