load organization model and not just the string
fix prevent used deadline on running campaigns
Merge pull request #1272 from onepercentclub/hotfix/CLUB-1343

load organization model and not just the string
Merge pull request #1273 from onepercentclub/feature/CLUB-1338

fix prevent used deadline on running campaigns
merge dev/booking in develop that has dev/onepercent-donations
Merge remote-tracking branch 'origin/master' into develop
removed syntax errors in project route by deleting badly merged code
Remove full_name from BaseUser
Merge pull request #1275 from onepercentclub/feature/fix-fullname

Remove full_name from BaseUser
implement validate unique method to prevent duplicate Follow objects
removed unusued import and redundant whitespace
Merge pull request #1280 from onepercentclub/feature/fix-follow-duplicates

Feature/fix follow duplicates
Merge remote-tracking branch 'origin/develop' into front-end/refactor-booking

Conflicts:
	bluebottle/bb_projects/static/js/bluebottle/bb_projects/routes.js
	setup.py