controller DI via setters
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/core/route.php