Coordinates resolver
Merge remote-tracking branch 'origin/master'

Conflicts:
	messiah/messiah/templates/input_form.html