Sliding
Merge remote-tracking branch 'origin/master'

Conflicts:
	exp2014/public/stylesheets/style.css
	exp2014/views/pubListe.jade