Upload icon images for categories.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
New icon column for categories.
icons for categories with glyphicon or font-awesome.
update icon picker to accept glyphicon and font-awesome icons.
Merge pull request #258 from oliverds/master

Icons for categories #825