Hotovo!
Merge origin/Editor into Editor

Conflicts:
	Editor/src/main/java/editor/newp/MainScene1.java
	Editor/src/main/java/editor/newp/TestClass.java