yjy:tasking1:modified the file "main-spec.js"
Merge branch 'master' of github.com:zlienqwe/pos_v1

Conflicts:
	pos_v1/spec/main-spec.js