Reconstruct entities, reform file reading method, fulfill adding special
grids on each level
Restrict timeout to 5s
Merge with comen-master: File uploading updated
Merge branch 'comen-master'
Complete advanced search
Signed-off-by: unknown <swei019@SWEI01971.us.nam.ad.pwcinternal.com>