Meta tags
Merge branch 'post' into development

Conflicts:
	atom.xml
Merge pull request #563 from luixxiul/development

Development