Merge origin/master

Conflicts:
	classes/DataProvider.class.php
	index.php
	modules/blog/header.php
	modules/messages/index.php
	modules/page/administration/index.php
	modules/page/index.php
	modules/register/index.php
	system/bootstrap.php