Signed-off-by: codekitten <codekitten@ict>
Merge branch 'master' of https://github.com/dadoosoon/price-server.git

Conflicts:
	.settings/org.eclipse.wst.common.component

Signed-off-by: codekitten <codekitten@ict>