[Misc] Fix config
Merge commit 'c6ee06037885cfadc4c87b1d7481d4507e1bf6ed'

Conflicts:
	projects/cooperate/src/main/webapp/WEB-INF/applicationContext.xml
[Misc] Refine config