added ember fb library, base tpl, and fb credentials in app.js
Merge branch 'feature/CLUB-563' into feature/CLUB-567d
Merge remote-tracking branch 'upstream/develop' into feature/CLUB-567d
fb login loggin in but not seting curretn user
added new initial migration for bb_account
Merge branch 'develop' into feature/CLUB-567d

Conflicts:
	bluebottle/common/static/js/bluebottle/auth_jwt.js
merge fix for develop branch
fixes for tests, includes updates for ProjectPhaseLog
Merge branch 'feature/CLUB-567d' of github.com:onepercentclub/bluebottle into feature/CLUB-567d

Conflicts:
	bluebottle/common/static/js/bluebottle/auth_jwt.js
Merge branch 'develop' into feature/CLUB-567d

Conflicts:
	bluebottle/bb_accounts/static/js/bluebottle/bb_accounts/controllers.js
update grunt/test dependencies
fix js tests - needed to add some dependencies like facebook and bootstrap
Remove debugger
Change variable name to lowercase as it is defined inside method scope only
Merge pull request #650 from onepercentclub/feature/CLUB-567d

Feature/club 567d