~~~
Merge branch 'master' of github.com:pomahtuk/django-geoportal