wanshan dayin
Merge branch 'master' of https://github.com/daodaoliang/caicai
添加前台打印机
Merge branch 'master' of https://github.com/daodaoliang/caicai

Conflicts:
	src/icommandhandler.cpp
	src/main.cpp