update code
Merge branch 'master' of http://github.com/anhkhoi/locson.git