6+165415616
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebRoot/WEB-INF/classes/applicationContext.xml
	src/applicationContext.xml