Merge origin/master

Conflicts:
	controler/content.php
Merge origin/master

Conflicts:
	controler/content.php
Merge origin/master