Bugfix - wrong default controller loading error
Merge remote-tracking branch 'origin/master'

Conflicts:
	dispatcher.php