fixed bad changes
Merge branch 'master' of github.com:phoenixbox/socrada