first comitt
Merge origin/master

Conflicts:
	includes/access_right.php
	js/core.js
	js/popup.js
	modules/tickets/new.php
	modules/tickets/process_new_ticket.php
	plugins/barcode/class/BCGFontFile.php
	plugins/barcode/class/BCGean8.barcode.php
Merge origin/master

Conflicts:
	includes/access_right.php
	js/core.js
	js/popup.js
	modules/tickets/new.php
	modules/tickets/process_new_ticket.php
	plugins/barcode/class/BCGFontFile.php
	plugins/barcode/class/BCGean8.barcode.php