Merge origin/master

Conflicts:
	Test/src/PROZE/GUI/TestForm.java
Merge origin/master