Did nothing but making a commit.
Translated
Merge branch 'master' of github.com:Tuxion/tuxion.cms

Conflicts:
	site/components/timeline/templates/global/__blogposts_entry.php