Merge branch '61-default-loc' into '2.1-dev'

Default (x,y) position on admin map

See merge request !31
3 jobs for 2.1-dev in 1 minute and 38 seconds