Police updates
Few fixes
Merge branch 'master' of github.com:leonpegg/springhack