Merge origin/master

Conflicts:
	config/config.php
	css/layout.css
	css/print.css
	db/inventory.sql
	includes/adjust_by_location.php
	includes/count_by_location.php
	includes/info.php
	includes/move_by_location.php
	js/core.js
	js/tabs.js
	modules/dashboard/index.php
	modules/inventory/adjust_stock.php
	modules/inventory/movement_history.php
	modules/inventory/new_count_sheet.php
	modules/inventory/reoder_stock.php
	modules/inventory/suggest_reorder.php
	modules/inventory/transfer_stock.php
	modules/purchases/edit_purchase.php
	modules/purchases/process_purchase_order.php
	modules/purchases/purchase_order.php
	modules/purchases/reorder.php
	modules/reports/inventory_movement.php
	modules/sales/edit_sale.php
	modules/sales/new_order.php
	nbproject/project.properties
	plugins/dompdf/lib/fonts/log.htm
Merge origin/master

Conflicts:
	config/config.php
	css/layout.css
	css/print.css
	db/inventory.sql
	includes/adjust_by_location.php
	includes/count_by_location.php
	includes/info.php
	includes/move_by_location.php
	js/core.js
	js/tabs.js
	modules/dashboard/index.php
	modules/inventory/adjust_stock.php
	modules/inventory/movement_history.php
	modules/inventory/new_count_sheet.php
	modules/inventory/reoder_stock.php
	modules/inventory/suggest_reorder.php
	modules/inventory/transfer_stock.php
	modules/purchases/edit_purchase.php
	modules/purchases/process_purchase_order.php
	modules/purchases/purchase_order.php
	modules/purchases/reorder.php
	modules/reports/inventory_movement.php
	modules/sales/edit_sale.php
	modules/sales/new_order.php
	nbproject/project.properties
	plugins/dompdf/lib/fonts/log.htm