Merge branch 'develop' into feature/CLUB-567d

Conflicts:
	bluebottle/common/static/js/bluebottle/auth_jwt.js
Merge branch 'feature/CLUB-567d' of github.com:onepercentclub/bluebottle into feature/CLUB-567d

Conflicts:
	bluebottle/common/static/js/bluebottle/auth_jwt.js