//
Merge branch 'master' of https://github.com/zorel/olccs-rails
Merge branch 'master' of https://github.com/zorel/olccs-rails
merge prod
Merge branch 'master' of https://github.com/zorel/olccs-rails

Conflicts:
	app/views/tribune/_result.json.erb
	db/schema.rb
Merge branch 'master' of https://github.com/zorel/olccs-rails
Merge branch 'master' of https://github.com/zorel/olccs-rails
threadsafe à on
Merge branch 'master' of https://github.com/zorel/olccs-rails
Merge branch 'master' of https://github.com/zorel/olccs-rails
Merge branch 'master' of https://github.com/zorel/olccs-rails

Conflicts:
	app/models/tribune.rb