merge
Merge branch 'master' of https://github.com/UrbanIF/urban_space_100

Conflicts:
	src/scripts/grid.coffee