update 040314
Merge branch 'master' of https://github.com/slub/vkviewer

Conflicts:
	env/vkviewer/python/proxy.py
	env/vkviewer/static/js/ol3/tools/Georeferencer.js
	env/vkviewer/templates/georeference_start.mako
update