with newest 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'
退机登记