Fix for DERP server
Another fix for DERP server
Merge branch 'master' of https://github.com/Jakst/UTique

Conflicts:
	app/Config/database.php