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