CLUB-682, readded fieldsToWatch to enable that's better message on signup
CLUB-682, fixing password reset
Merge branch 'dev/onepercent' into fixture/CLUB-682

Conflicts:
	bluebottle/bb_accounts/static/js/bluebottle/bb_accounts/controllers.js
CLUB-682, #resolved, cleaned
Merge pull request #1089 from onepercentclub/fixture/CLUB-682

Fixture/club 682