PBL-5459: Added glyphicons back.
Merge branch 'master' of github.com:CloudPebble/CloudPebble