Make socialshareprivacy and joyride regular dependencies
Merge branch 'develop' into hhu

Conflicts:
	buildout_common.cfg