updates in inventory module
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/inventory/controllers/OutgoingInventoryController.php
	protected/modules/inventory/models/IncomingInventoryDetail.php
	protected/modules/inventory/views/customerItem/customerItemForm.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/inventory/controllers/CustomerItemController.php
	protected/modules/inventory/controllers/IncomingInventoryController.php
	protected/modules/inventory/controllers/OutgoingInventoryController.php
	protected/modules/inventory/controllers/ReceivingInventoryController.php
	protected/modules/inventory/models/CustomerItem.php
	protected/modules/inventory/models/ReceivingInventory.php
	protected/modules/inventory/views/customerItem/_form.php
	protected/modules/inventory/views/customerItem/admin.php
	protected/modules/inventory/views/incomingInventory/admin.php
	protected/modules/inventory/views/outgoingInventory/admin.php
	protected/views/layouts/_menu.php
Conflicts:
	protected/modules/inventory/controllers/CustomerItemController.php
	protected/modules/inventory/controllers/IncomingInventoryController.php
	protected/modules/inventory/controllers/OutgoingInventoryController.php
	protected/modules/inventory/controllers/ReceivingInventoryController.php
	protected/modules/inventory/models/IncomingInventory.php
	protected/modules/inventory/models/OutgoingInventory.php
	protected/modules/inventory/views/incomingInventory/incomingForm.php
	protected/modules/inventory/views/outgoingInventory/outgoingForm.php
	protected/modules/inventory/views/receivingInventory/receivingForm.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/pome/views/default/_viewtotalnational.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/inventory/controllers/CustomerItemController.php
	protected/modules/inventory/controllers/IncomingInventoryController.php
	protected/modules/inventory/controllers/OutgoingInventoryController.php
	protected/modules/inventory/models/CustomerItemDetail.php
	protected/modules/inventory/models/OutgoingInventory.php
	protected/modules/inventory/views/incomingInventory/incomingForm.php
	protected/modules/inventory/views/outgoingInventory/outgoingForm.php
	protected/modules/inventory/views/receivingInventory/receivingForm.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/inventory/controllers/CustomerItemController.php
	protected/modules/inventory/models/IncomingInventory.php
	protected/modules/inventory/models/OutgoingInventory.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/pome/controllers/DefaultController.php
	protected/modules/pome/models/pome.php
	protected/modules/pome/views/default/_view.php
	protected/modules/pome/views/default/_viewtldashboard.php
	protected/modules/pome/views/default/_viewtotalnational.php
	protected/modules/pome/views/default/index.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/inventory/controllers/IncomingInventoryController.php
	protected/modules/inventory/controllers/OutgoingInventoryController.php
	protected/modules/inventory/controllers/ReceivingInventoryController.php
	protected/modules/inventory/models/CustomerItem.php
	protected/modules/inventory/models/CustomerItemDetail.php
	protected/modules/inventory/views/customerItem/admin.php
	protected/modules/inventory/views/incomingInventory/admin.php
	protected/modules/inventory/views/outgoingInventory/admin.php
	protected/modules/inventory/views/outgoingInventory/outgoingForm.php
	protected/modules/inventory/views/receivingInventory/admin.php
	protected/modules/inventory/views/receivingInventory/receivingForm.php
	protected/views/site/dashboard_abi.php
added employee poi
commit in conflicts
Merge pull request #58 from Gryphyn23/master

added employee poi