Takmer final
Merge branch 'dev' of https://github.com/scarious/2Deditor into dev

Conflicts:
	2Deditor/src/graphics/Diamond.java
	2Deditor/src/graphics/Elipse.java
	2Deditor/src/graphics/ElipseDiagram.java
	2Deditor/src/graphics/GraphicsObject.java
	2Deditor/src/graphics/Line.java
	2Deditor/src/graphics/Pencil.java
	2Deditor/src/graphics/Picture.java
	2Deditor/src/graphics/Rectangle.java
	2Deditor/src/graphics/TextArea.java
	2Deditor/src/graphics/Triangle.java
	2Deditor/src/main/Menu.java
	2Deditor/src/main/Paint2d.java