Merge pull request #2 from cdman/development

Merge latest changes from upstream.
Merge pull request #1 from cdman/ominauth-sso-cookie-integration

Ominauth sso cookie integration
Synchronize avatar URL with the SSO cookie