update
update
update
update
update
Merge origin/master

Conflicts:
	.gitignore
	config/config.php
	includes/access_right.php
	js/popup.js
	modules/settings/fare_tax.php
	plugins/barcode/class/BCGFontFile.php
	plugins/barcode/class/BCGean8.barcode.php
	plugins/dompdf/lib/fonts/DejaVuSansMono.ttf
	plugins/dompdf/lib/fonts/seguisb.ttf
update