glyphicons fix
Merge remote-tracking branch 'origin/bootstrap3' into bootstrap3