pivot
Merge branch 'master' of github.com:segfault87/Konstruktor

Conflicts:
	src/app/pivotextension.cpp
	src/libldr/metrics.cpp
	src/libldr/metrics.h
	src/renderer/renderer_opengl_retained.cpp