Merge wip to Master

Paul Zakalekrequested to merge
wip into master

Added axis class and made all axis manipulations equivalent... This broke many functions which will be updated soon.

Merge request reports