CLUB-683 #resolved added protected field to settings
Merge pull request #1393 from onepercentclub/feature/CLUB-683

CLUB-683 #resolved added protected field to settings
Removed weird button loader animation on enter
Merge pull request #1397 from FransTwisk/Font-end-fixes

Removed weird button loader animation on enter
fix displaying the fb login button
Update requirements.txt
bump bb commit to get fix for js compression on server
Merge remote-tracking branch 'origin/develop' into feature/merge-master

Conflicts:
	requirements/requirements.txt