Merge branch 'gh-pages' into v3.0
updated glyphicon path
Merge branch 'v3.0' into gh-pages