added bootstrap glyphicons and 2 more templates
trying to cherry-pick stuff from master