snippets
Merge branch 'post' into development

Conflicts:
	atom.xml
	sitemap.xml
snippet
Merge pull request #574 from luixxiul/development

Development