Fix #BB-1175
Fix #bb-914
Fix #bb-1005
Add new data from staging/Niels
Remove wip

Conflicts:
	apps/bluebottle_utils/bb_makemessages.py
New fixture for redirects
Merge pull request #568 from gannetson/multiple-fixes

Multiple fixes