Work work.
Merge branch 'develop'

Conflicts:
	classes/controller/backend.php
	classes/kohana/backend.php
	classes/unit.php
	init.php