Tweaking notice for #114, as social auth login disabled at present
Merge branch 'develop' into staging