updated pricing service and CAD RDF export
adding vendor information into ASM
updated pricing service
Merge branch 'master' of https://github.com/KWARC/Sally

Conflicts:
	sally_app/session.log
	sally_spreadsheet/iui-model.rdf
	sally_spreadsheet/iui-model.rdf.64
	sally_spreadsheet/src/test/java/info/kwarc/sissi/model/document/spreadsheet/IUIPaperData.java