Implement more font-awesome icons
Fix bug 856118: Switch to using class-based generic views.
fix bug 880027 - Match multiple terms
merge
Merge pull request #1153 from ubernostrum/class-based-views-856118

Fix bug 856118: Switch to using class-based generic views.
Fix bug 882555: Remove obsolete references to specific view names.
Merge pull request #1162 from ubernostrum/class-based-views-856118

Fix bug 882555: Remove obsolete references to specific view names.
Merge pull request #1160 from darkwing/search-match-880027

fix bug 880027 - Match multiple terms
fix bug 882709 - specify template_name for search
Merge pull request #1165 from groovecoder/submission-list-template-882709

fix bug 882709 - specify template_name for search
Remove youtube_wysiwyg waffle flag
Merge pull request #1158 from darkwing/more-font-awesomeness

Implement more font-awesome icons
Merge pull request #1167 from darkwing/remove-youtube-waffle

Remove youtube_wysiwyg waffle flag