Add glyphicons
Angular w/alerts, xhr
Merge remote-tracking branch 'origin/master'