Change cron time to 00:00
Merge branch 'master' into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed

Conflicts:
	conf/crontab.ugly
Merge branch 'master' into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed
Replace all NO-BREAK SPACE characters with normal spaces
Merge branch 'master' into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed
Merge branch 'staging-auto-deployed' of ssh://git.mysociety.org/data/git/public/pombola into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed

Conflicts:
	pombola/south_africa/data/constituencies_and_offices/all_constituencies.csv
Merge branch 'master' into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed
Merge branch 'master' into staging-auto-deployed