removing zip
merging with slider and proportio-web
normalized spip to slider
normalized spip to slider
Merge branch 'dev' of ../www/squelettes
rubrique-2 causes a conflict to skip, let's rename it !
adapted slider branch to spip, first actually functional commit!
Merge branch 'master' of ../www/squelettes

Conflicts:
	rubrique-static-template.html