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
prevent long titles in select box
Merge pull request #651 from onepercentclub/feature/CLUB-471

prevent long titles in select box
locale middleware in django should ignore api requests
events is deprecated, use actions in routes
set currentUser property for all controllers CLUB-560
use actions and not events for routes
- currentUser is set at page load now in an initializer, or when the user logs in or signs up
- can now set/get currentUser from controllers other than the
  currentUserController
Merge branch 'feature/CLUB-567d' of github.com:onepercentclub/bluebottle into feature/CLUB-567d

Conflicts:
	bluebottle/common/static/js/bluebottle/auth_jwt.js
Merge pull request #652 from onepercentclub/feature/api-auth-fixes

CLUB-560 - API auth fixes
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