Change status colours to resolve #172 (readable for colour-blind people)
Merge branch 'master' into status-colours

Conflicts:
	public/css/style.css
Merge pull request #214 from okfn/status-colours

Status colours