14
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	core/manageTournament.class.php