Add style for GRID
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/controllers/warehouse/inventoryCtrl.js.coffee
	app/assets/templates/warehouse/inventory.html