admin form for collections
Merge pull request #205 from digitalgreenorg/social_admincommunity

admin form for collections
adding videos not in collectin also to the search page

-- redirecting these vids to old video page
--added a horizontal search bar for videos in collection admin page.
Merge pull request #207 from digitalgreenorg/social_video

Adding videos not in collection also to the search page. Linking to the old video page until we have a standalone-video page in the new website.
Merge pull request #208 from digitalgreenorg/social_collection_video_filter

--added a horizontal search bar for videos in collection admin page.
post save for activities and resolving cyclic imports
Merge branch 'social_cron_job' of https://github.com/digitalgreenorg/dg into social_cron_job

Conflicts:
	social_website/models.py
	social_website/post_save_funcs.py
admin for careers page and migrations
removed unwanted divs
Merge pull request #210 from digitalgreenorg/social_adminchanges

Career page is populated through admin. Added hierarchy to team page.
when adding a collection activity check whether it contains video or not
Merge remote-tracking branch 'origin/social_live' into social_cron_job

Conflicts:
	social_website/models.py
Village activity , Collection Activity, Video Added To the Collection