derp :(
Merge branch 'master' of https://github.com/Jakst/UTique

Conflicts:
	app/Config/database.php