round2_model queries
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/models/round2_model.php
adjusted round2 queries