fixed IE bug and conflict with bootstrap.css
Merge branch 'master' into gh-pages