Elevation layer

Ready to merge after 2D GUI.
2d-gui & elevationLayer merge does not pose any problems