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

Conflicts:
	src/main/java/com/lynk/quot/domain/Machine.java
	src/main/java/com/lynk/quot/domain/MachineCriteria.java
	src/main/resources/database/generator.xml
	src/main/resources/sqlMaps/MachineMapper.xml