all files pass jscs and jshint
fixed merge conflicts in city and server
Merge pull request #50 from PlantAlert/test

Test