Added necessary groups for voting certain proposals
Merge branch 'master' of https://github.com/sandb/getopinionated.git

Conflicts:
	proposing/admin.py