messages
Merge branch 'master' of github.com:ousmaneo/village-N

Conflicts:
	www/sites/all/modules/custom/nvillage_config/nvillage_config.module
	www/sites/all/themes/nvillage/css/style.css