Fixes to do list link to registration period
fix #505
Fixes the top bar icons of the instance dashboard
fix #507
Fixes the proposal abstract word count javascript functions
fix #510
Merge pull request #508 from ChrisBr/fix_dashboard

Fixes the top bar icons of the instance dashboard
Merge pull request #509 from ChrisBr/fix_to_do

Fixes to do list link to registration period
Improve spacing around comma in conference list.
Merge pull request #513 from ChrisBr/fix_proposal_js

Fixes the proposal abstract word count javascript functions
Describe the splash area as 'Lodging' instead of 'Lodgings'...

... becauase it just sounds clunky.
Merge pull request #516 from openSUSE/spacing-fix

Improve spacing around comma in conference list.
Merge pull request #517 from openSUSE/lodging-section

Describe the splash area as 'Lodging' instead of 'Lodgings'...
I can't take credit for all of this :-)
Merge pull request #521 from mbarringer/master

I can't take credit for OSEM :-)
Implements username authentication
It's now possible to login with either username or email
That's necessary to be backward compatible for iChain login
Implements iChain authentication
Merge pull request #528 from ChrisBr/devise

Implements iChain authentication
Set the ichain base url
Update rails/sprockets to fix CVE-2014-7818/CVE-2014-7819
Include disabled omniauth in ichain config for delayed jobs
Use the correct URL for the ichain login
It's always hard to remove another layer of indirection...