lijixin bug test
Merge branch 'bguTest' of github.com:VectorWinner/takeaway into bug
pop_window bug fixed
conflict fixed
conflict
Merge branch 'dev' of github.com:VectorWinner/takeaway into dev