Merge origin/master

Conflicts:
	config/config.php
	includes/access_right.php
	js/popup.js
	js/report_filters.js
	nbproject/project.properties
	plugins/dompdf/lib/fonts/log.htm
Merge origin/master

Conflicts:
	css/pop-up.css
	includes/adjust_by_location.php
	modules/purchases/purchase_order_preview.php
	modules/sales/edit_sale.php
	nbproject/project.properties