fixes #363 issues and sprint discipline
Implements Contacts
Move Conference contact details to Contact
enable openids in development by default, do not show openID header unless keys are set.
Merge pull request #398 from differentreality/openid_mock

OpenID mocks
[ci skip] Improve on issues section and meeting day
Redirect to root path if splash is not public
Merge pull request #402 from openSUSE/review_140730_363_sprint_discipline

fixes #363 issues and sprint discipline
Merge pull request #427 from gopesht/fix#309

Redirect to root path if splash is not public
Merge pull request #409 from hennevogel/refactor-conference-contact

Refactor conference contact
Refactoring Conference/Event media to new media object
close #420
Merge pull request #424 from ChrisBr/refactor_media

Refactoring Conference/Event media to new media object
Disable :notify_errbit in deploy. Issue #431
Merge branch 'cancan_new_approach' of github.com:differentreality/osem into cancan_new_approach

Conflicts:
	app/controllers/conference_controller.rb
	app/controllers/conference_registration_controller.rb
	app/views/layouts/_admin_sidebar.html.haml
	db/schema.rb
	spec/views/admin/conference/edit.html.haml_spec.rb
	spec/views/conference/show.html.haml_spec.rb
wip
wip
wip