fixes for formatmanager, discount now in xtable, v 1.2 beta2
Merge remote-tracking branch 'origin/master'
fixing journal for discounted items and try to get office handling better
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mpv5/resources/languages/Panels.properties
fixed export path issues