Merge branch 'master' of https://github.com/Thawatchai-T/eoq

Conflicts:
	eoqLab/app/view/home/StockWindow.js