Police data finished
Merge branch 'master' of github.com:leonpegg/springhack

Conflicts:
	views/index.jade