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

Conflicts:
	src/main/java/com/lynk/quot/biz/impl/MachineBizImpl.java
	src/main/java/com/lynk/quot/domain/Machine.java