Merge branch 'no-ccap'
Merge branch 'no-ccap'

Conflicts:
	src/public/css/style.css
	src/public/scripts/ie7.js
	src/public/scripts/script.js
	src/views/_footer.ejs
	src/views/culture.ejs
	src/views/products.ejs
fix Conflicts
Merge branch 'master' into no-ccap