CLUB-109 add migration for adding language to projects
Merge remote-tracking branch 'upstream/release/bb-development' into feature/109-project-language
add nl and en languages to migration
project model, serializer, and ember update for Story field with redactor
added story tpl file that overrides bluebottle base tpl
Merge branch 'release/bb-development' of github.com:onepercentclub/onepercentclub-site into feature/club-119-redactor
updated migration script that now copies editor data to new story field
bump BB version
Fix some serializers and adjust migration
Merge branch 'feature/109-project-language' of github.com:onepercentclub/onepercentclub-site into feature/big-merge

Conflicts:
	sql/migration.sql
Merge branch 'feature/club-120-migrate-fields' of https://github.com/aethemba/onepercentclub-site into feature/big-merge
Fixes and tweaks to get things going again
New bb version 1.0.6
Merge pull request #1084 from gannetson/feature/big-merge

Feature/big merge
added select Theme generic
in goal amount needed fixed
CLUB-117 use language picker on project pitch page
CLUB-136 add model overrides to org for friendly and required fields, and ensure organizations app is loaded before bb_organizations so template overrides work
fix fabfile and update gitpython package
Merge pull request #1087 from onepercentclub/feature/add-org-friendly-fields

CLUB-136 add model overrides to org for friendly and required fields