updating markers
adding polylines
Merge branch 'sendtolocation' of https://github.com/esteluk/command-and-influence

Conflicts:
	web/js/main.js
css tweaks and js alerts for sendtolocation work
last minute changes
last push before presentation, trying cloudbase push
case sensetivity
Merge branch 'master' of github.com:galbus/command-and-influence

Conflicts:
	web/js/main.js