Merge branch 'develop' into feature/facebook-group
Experimenting with restricted groups
[ci skip]
Merge branch 'develop' into feature/facebook-group
Merge branch 'develop' into feature/facebook-group

Conflicts:
	app/models/concerns/user/authentication.rb
Merge branch 'feature/facebook-group' into develop
Fixes #9