Adjusted training layout, tickets, and events
Merge branch 'master' of https://github.com/ArchSecurityLabs/CircleCityCon

Conflicts:
	includes/training/training2.php