file conflict resolve
Merge branch 'master' of https://github.com/huhuo/car-rental.git
optimize the cache file upload plugin, extract all java script coding to
jquery function fileUpload() in huhuo.js