Merge branch 'master' of https://github.com/AndrewMalapura/quick-report

Conflicts:
	quick-report/src/main/resources/opo/vistec/hibernate/SalesLine.hbm.xml

Signed-off-by: AndrewMalapura <malapura@mail.ru>
Merge branch 'master' of https://github.com/AndrewMalapura/quick-report
home

Signed-off-by: AndrewMalapura <malapura@mail.ru>