Fxi bugs of display hint

while finish import data and before merge them
improve performance

of merging stage while importing data
Merge branch 'fixbug-1.0.20140821' into develop