UC test
Merge branch 'master' of https://github.com/GolfOutingLive/GolfOutingLive

Conflicts:
	application/controllers/user_controller.php
Fuck this merge tool