Merge branch 'master' of https://github.com/kmiernik/pixie_scan

Conflicts:
	Config.xml.93br
Merge branch 'master' of https://github.com/kmiernik/pixie_scan

Conflicts:
	Config.xml.93br