Remove glyphicons
Update composer.json
Update .gitignore
Merge branch 'master' into deploy