zeug
Merge branch 'develop' of https://github.com/hiaselhans/OpenGlider into develop

Conflicts:
	openglider/jsonify/__init__.py
	openglider/lines/elements.py