Merge remote-tracking branch 'mbi/develop' into performcoop

Conflicts:
	rosetta/access.py
	rosetta/conf/settings.py
	rosetta/locale/es/LC_MESSAGES/django.po
	rosetta/locale/fr/LC_MESSAGES/django.mo
	rosetta/locale/uk/LC_MESSAGES/django.po
	rosetta/templates/rosetta/pofile.html
	rosetta/tests/__init__.py
	rosetta/urls.py
	rosetta/views.py