commited

Conflicts:
	protected/data/manager.sql
	protected/modules/manager/controllers/DefaultController.php