#1301 -added updates to include icons for files and events
Merge branch 'bixly-testing' of https://github.com/tendenci/tendenci into bixly-testing