Added more code
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	config/routing.php
Moved bootstrapping from index.php to class