Changes to allow F3F events to have groups for scoring if necessary
Merge branch 'master' of http://github.com/timtraver/rcvault

Conflicts:
	php/templates/event_round_edit.tpl
Merge branch 'master' of http://github.com/timtraver/rcvault
Merge branch 'master' of http://github.com/timtraver/rcvault
Merge branch 'master' of http://github.com/timtraver/rcvault
fix