show no of pre-registered people in proposal list
Fixes for voting on proposals. 0 for no voting option. Set default value in migration to avoid blank/null problems.
migration, add down func
show voting options only if rating is enabled (>0)
Volunteers, positions and days and volunteers list for admin, volunteering option for attendees
Merge pull request #28 from differentreality/event_registration

Show No of registrations for proposal, in proposal index page
Merge pull request #29 from differentreality/voting_fixes

Voting fixes
question builder
fix removal of answers
voting visual changes
Add no of voters in events index
Add difficulty levels
fixed table width, no td in index if no voting options
Merge pull request #34 from differentreality/final_voting_visual

Voting visual
Merge pull request #33 from differentreality/final_difficulty_levels

Add difficulty levels
Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions

Conflicts:
	app/models/conference.rb
	config/routes.rb
Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers

Conflicts:
	app/models/conference.rb
	app/models/registration.rb
	app/views/admin/conference/_sidebar.html.haml
	app/views/conference_registration/register.html.haml
Fix merge leftovers
Simplify sidebar and navigation
Check existence of supporter levels
Only upcase languages if they exist...