communications admin forms
Merge remote-tracking branch 'origin/master' into social_admincomm

Conflicts:
	dg/website_admin.py
	social_website/admin.py
changes in social_website/models.py
updated sop
optimizing stats updation of videos
--Adding farmerbook in robots.txt for bots to not parse
Merge pull request #220 from digitalgreenorg/social_admincomm

Communications admin forms.
Merge remote-tracking branch 'origin/social_live' into social_featured_collection

Conflicts:
	social_website/models.py
Merge pull request #225 from digitalgreenorg/sopupdate

Update SOP on website.
Changing featured collection images path
adding show on homepage , show on language selection in featured collection model
changing collageURL to image field in featured Collection
making partner name unique (adding help text) and logoURL required field
adding show_on_homepage, show_on_language_selection in admin form
using filter instead of get to retrieve featured collection for a language and using show_on_homepage to get featured collection in case no language is selected
ignoring all collages added in this folder
Merge branch 'social_live' of https://github.com/digitalgreenorg/dg into social_live

Conflicts:
	social_website/models.py
Merge pull request #228 from digitalgreenorg/social_featured_collection

Communications admin. Allow for adding and creating featured collection.
removing unused list
Merge pull request #226 from digitalgreenorg/social_cron_job

Optimizing stats updation of videos.
Logfile must not be committed.
Use django after setting up environments.
Logfile created in social_website/uploads/log folder.