Work work.
Merge branch 'develop'

Conflicts:
	classes/controller/backend.php
	classes/kohana/backend.php
	classes/unit.php
	init.php
Merge branch 'develop' of https://github.com/Hete/kohana-backend into develop