commit juliette
Merge branch 'master' of https://github.com/Shic/shic

Conflicts:
	_app/mvc/v/mobile/blog/slideshow/slideshow.php
home slideshow + modif fond nespresso + coopersquare