Error resolved in get_group_type() templatetag
conflict resolved
Error for preferred language resolved in Browse topic app
Merge pull request #707 from supriyasawant/mongokit

Preferred Language error relsolved in Browse topic app when user is not logged in.
django-registration-email added to signup via email
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
code added for displaying CR resources on each topics landing page
code added for fetching the resources and differentiate into 8 defined categories for topic
commented conflicting tag for time being
Merge pull request #709 from sunnychaudhari/mywork

Resources has been displayed on topic landing page
bug resolved in get_preferred_lang
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
comment removed
Merge pull request #710 from supriyasawant/mongokit

bug resolved in get_preferred_lang
Pandora videos redundant display resolved
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
minor change made in fetch_wetube_video script
Merge pull request #711 from supriyasawant/mongokit

Pandora Videos redundancy resolved
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
update hi translation