slider
Merge branch 'master' of https://github.com/morocarlo/Cimm

Conflicts:
	Cimm/www/partials/home-content.html
	Cimm/www/partials/home.html