Get object from any controller, not just data controllers
Change format of data URLs
Merge branch 'origin/master'

Conflicts:
	config/bootstrap.php