Merge pull request #259 from oliverds/master

remove icons for categories with glyphicon or font-awesome.
closes #247
closes #252
closes #246
closes #249