+Inc Download - save as dummy if convert namespace fails
+ notifying user before redownloading db because of permission change
Merge branch 'coco_live_dummy_save' into coco_live
+ code documentation
+ docs at "/media/coco/docs/"
Merge branch 'coco_live' into coco_live_documentation
+ documentation finished
hierarchy no - admin
ordering on hierarchy in otherteams - view
google plus icon added in the footer
added google plus in website_footer_social.py
fixing indentation
Merge pull request #259 from digitalgreenorg/social_jlt

google plus icon added in the footer
Adding try catch when getting the partner
Return if partner does not exist
Merge pull request #261 from digitalgreenorg/master_website_hotfix_partner

Cron jobs: Adding try catch when Partner.objects.get for a partner which has been added on coco but not yet on the website.
--Pma Numbering fix.
Merge pull request #262 from digitalgreenorg/pma_numbering

--Pma Numbering fix.
Merge remote-tracking branch 'origin/master' into coco_live
Merge remote-tracking branch 'origin/coco_live_documentation' into coco_live

Conflicts:
	dg/media/coco/app/scripts/convert_namespace.js
	dg/media/coco/app/scripts/views/form.js
Merge remote-tracking branch 'origin/members_page'. Fixing ordering in other regions teams.
Bug: human_resources/team: 'location' used instead of the new model 'place'