Updated towards version 1.0
Merge origin/master

Conflicts:
	app/modules/page/administration/view/manager.php