edit authorization
Merge branch 'work_new' into work

Conflicts:
	protected/config/main.php