fixed modal window display bug on chrome and ie
Merge remote-tracking branch 'origin/master'