commit and merge with quang
enquiry lsit still nto working 

by Kim To, 21/10/2014