CLUB-575, fixing signup errors
Merge branch 'develop' into feature/CLUB-575

Conflicts:
	bluebottle/bb_accounts/static/js/bluebottle/bb_accounts/controllers.js
CLUB-575
Update models.js
merging with dev
Merge pull request #664 from onepercentclub/feature/CLUB-575

Feature/club 575