added user tests
updated group tests
Fixed merge issues
Merge branch 'master' of https://github.com/CIRB/django-fixmystreet

Conflicts:
	django_fixmystreet/backoffice/tests/groups.py