new password reset modal
Merge branch 'develop' into feature/CLUB-581
feature/CLUB-581 fixing resetPassword
CLUB-581, fixing reset password
Merge remote-tracking branch 'origin/develop' into feature/CLUB-581

Conflicts:
	bluebottle/bb_accounts/static/js/bluebottle/bb_accounts/controllers.js
CLUB-581, working now
CLUB-581, cleaning
Merge pull request #678 from onepercentclub/feature/CLUB-581

Feature/club 581