Project Setup
Merge branch 'master' of https://github.com/kouami/cms.git

Conflicts:
	CMSWeb/WebContent/WEB-INF/configs/security/cms-security-config.xml