New map markers!
Merge branch 'master' of github.com:gitoffourlawn/daemondash

Conflicts:
	code/umagellan/UMagellan/static/templates/course_table_row.mustache