Merge remote-tracking branch 'upstream/develop' into feature/CLUB-563
Merge remote-tracking branch 'upstream/develop' into feature/CLUB-563
made projectphaselog abstract, implemented it and fixed migrations
new updates for FB login
Merge remote-tracking branch 'upstream/develop' into feature/CLUB-563
merge fixes
updated registration code for FB login
fixed basic fb login
removed code for attempt to merge email and user in fb login
removed publish_actions permission
save extra FB data
removed auth app to BB and updated settings
updated urls for auth app
settings ref fix
ref fix in start tpl
req update
Merge pull request #1343 from onepercentclub/feature/CLUB-563

Feature/club 563
Merge remote-tracking branch 'origin/develop' into feature/bump-bb

Conflicts:
	requirements/requirements.txt