applicationcontext
Merge remote-tracking branch 'origin/master'

Conflicts:
	legoManager-web/src/main/webapp/WEB-INF/applicationContext.xml