import
Merge branch 'master' of github.com:abelass/astagroeting

Conflicts:
	.gitignore
	.project
	squelettes/body.html
	squelettes/content/401.html
	squelettes/content/404.html
	squelettes/content/article.html
	squelettes/content/login.html
	squelettes/content/rubrique.html
	squelettes/content/sommaire.html
	squelettes/head/article.html
	squelettes/head/breve.html
	squelettes/head/rubrique.html
	squelettes/header/dist.html
	squelettes/inclure/dist.html
	squelettes/inclure/einzeldarstellung.html
	squelettes/inclure/head.html
	squelettes/inclure/nav-secteurs.html
	squelettes/modeles/video_dist.html
	squelettes/rubrique.html
	squelettes/scripts/dist/html5shiv-printshiv.js
	squelettes/scripts/dist/html5shiv.js
	squelettes/scripts/mediaplayer-5.10/preview.jpg
	squelettes/scripts/mediaplayer-5.10/readme.html
url absolue