Merge branch 'import'
commented files to be used for inventory stock control monitoring and testing
added view files for stock control checkout
modified controller and model for stock control during checkout procedure
added view changes for stock control checkout
Merge branch 'inventory'
removed old stock control and csv import files they have been moved to there own directory and will be tracked on there own branch now
Merge branch 'import'
added stock_control model
Merge branch 'import'
Modified Files:
  admin/controller/import/*
  admin/model/import/*
  :admin/language/english/import/*
added stock_control model file
Merge branch 'inventory'
Modified Files:
  admin/controller/inventory/*
  admin/model/inventory/*
  admin/language/english/inventory/*
  admin/view/template/inventory/*
set blog up for merge
Modified files:
  admin/controller/extras/*
  admin/model/extras/*
  admin/language/english/extras/*
  catalog/controller/extras/*
  catalog/model/extras/*
  catalog/language/english/extras/*