xong fix bug allocation
Merge branch 'master' of https://github.com/longtranthanh/worktraq_client