Add in from core
Merge remote-tracking branch 'origin/from_core'

Conflicts:
	src/core/javascripts/controllers/base.js.coffee
	src/core/javascripts/models/base.js.coffee
	src/core/javascripts/models/basket_item.js.coffee
Add in $bbug injector