Add changed.
Merge branch 'master' of https://github.com/LynkLin/quot-server.git

Conflicts:
	src/main/resources/download/reports/Product.jasper
	src/main/resources/download/reports/Product.jrxml