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

Conflicts:
	www/sites/all/themes/nvillage/css/style-blessed3.css
	www/sites/all/themes/nvillage/css/style.css
Merge branch 'master' of github.com:ousmaneo/village-N

Conflicts:
	www/sites/all/themes/nvillage/css/style-blessed1.css
	www/sites/all/themes/nvillage/css/style-blessed3.css
	www/sites/all/themes/nvillage/css/style.css