merging with slider and proportio-web
normalized spip to slider
Merge branch 'dev' of ../www/squelettes
Merge branch 'master' of ../www/squelettes

Conflicts:
	rubrique-static-template.html
Merge branch 'master' of ../www/squelettes

Conflicts:
	css/full.css
	js/ui.js
Merge branch 'master' of ../www/squelettes
Merge branch 'master' of ../www/squelettes
Merge branch 'master' of ../www/squelettes
Merge branch 'master' of ../www/squelettes
Merge branch 'master' of ../www/squelettes
Merge branch 'master' of ../www/squelettes
reading missing files
Merge branch 'master' of ../www/squelettes
Merge branch 'master' of ../www/squelettes
Merge branch 'master' of ../www/squelettes
Merge branch 'master' of ../www/squelettes
Merge branch 'master' of ../www/squelettes
Merge branch 'master' of ../www/squelettes
Merge branch 'master' of ../www/squelettes
Merge branch 'master' of ../www/squelettes