Merge branch 'master' into NewMetadata

Conflicts:
	src/main/resources/cz/zcu/kiv/eegdatabase/wui/app/EEGDataBaseApplication.properties