Committing local UI changes to pull recent backend changes.
Merge branch 'master' of https://github.com/GolfOutingLive/GolfOutingLive

Conflicts:
	application/logs/sql.txt