fixed bugs
fixed bugs
Merge branch 'master' of https://github.com/geoonn/app

Conflicts:
	assets/html/dealer_poslist.html