test
Merge branch 'master' into liang
任务分派
add a ignore file
Merge branch 'master' of github.com:lightPang/pos

Conflicts:
	.gitignore
	Pos/App/Runtime/Logs/14_08_23.log
...
Merge branch 'liang'
...
巡检记录
Merge branch 'liang'
退机登记
退机记录