Upload icon images for categories and locations.
Upload icon images for categories and locations.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
General settings, move image settings to view image
General settings, move image settings to view image
update icon picker to accept glyphicon and font-awesome icons.
New icon column for categories and locations.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	install/samples/install.sql.php
General settings, move listing settings to view advertisement
icons for categories with glyphicon or font-awesome.
Merge pull request #866 from oliverds/master

Icons for categories. General settings, move settings to advertisement