Import, very close!
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/controllers/warehouse/warehouse.coffee