Removed stale line of code
Peek
Autowatch
Merge branch 'master' into map_tiles

Conflicts:
	public/js/app.js
	src/rts_world.coffee