Merge remote-tracking branch 'origin/balhar' into balhar

Conflicts:
	src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/WizardTabbedPanelPage$TabPanel1.html
Merged