fix bug 452947 - Display search results from user's locale
Fix bug 856118: Switch to using class-based generic views.
Merge pull request #1159 from darkwing/search-locale-452947

fix bug 452947 - Display search results from user's locale
Merge pull request #1153 from ubernostrum/class-based-views-856118

Fix bug 856118: Switch to using class-based generic views.