Longer time outs in selenium
Merge pull request #1167 from onepercentclub/feature/CLUB-966-2

Feature/club 966 2
fix loading of fundraisers list in admin CLUB-1120
Merge pull request #1170 from onepercentclub/feature/increase-time-out

Longer time outs in selenium
Merge remote-tracking branch 'origin/dev/onepercent-donations' into feature/CLUB-1120
Merge pull request #1171 from onepercentclub/feature/CLUB-1120

Fix loading of fundraisers list in admin CLUB-1120
Merge pull request #1172 from onepercentclub/feature/CLUB-966-2

Changed tests
Organization model changes for Salesforce
fixed login function
store calling controller in FBApp namespace
Merge pull request #1173 from onepercentclub/feature/sf-sync

Organization model changes for Salesforce
Merge pull request #1174 from onepercentclub/feature/fix-facebook-modal-close

store calling controller in FBApp namespace
Merge remote-tracking branch 'origin/dev/onepercent-donations' into feature/CLUB-966-2

Conflicts:
	bluebottle/test/utils.py