Merge branch 'master' into newsfeeds
Create 1.md
Typos
Merge commit 'fe322ff' into newsfeeds
Merge branch 'newsfeeds' of github.com:Neamar/corporate into newsfeeds
Merge branch 'master' into newsfeeds

Conflicts:
	datas/docs/rules.md
	datas/docs/seisme.md
Merge branch 'newsfeeds' into newsfeeds-templating