zmiany
Merge origin/master

Conflicts:
	Java/moziQ/src/moziq/gui/table_window/QNeededPanel.java
	Java/moziQ/src/moziq/templates/table_window/QGeneralFrame.java