updating js for coordinates
Merge branch 'master' of github.com:hahahana/wildcard

Conflicts:
	app/assets/javascripts/application.js