repaired git state before pull
Merge remote-tracking branch 'origin/balhar' into balhar

Conflicts:
	src/main/java/cz/zcu/kiv/eegdatabase/wui/app/EEGDataBaseApplication.java
	src/main/java/cz/zcu/kiv/eegdatabase/wui/core/experiments/ExperimentAddDTO.java
	src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentForm.java
	src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentPage.html
	src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentPage.java
	src/main/webapp/files/js/experiments/wizard.js
Filled and added some new modal windows for add-experiment-wizard-page.
Merge branch 'sutr' into balhar

Conflicts:
	.gitignore
	src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentPage.html
Merge remote-tracking branch 'origin/balhar' into balhar

Conflicts:
	src/main/java/cz/zcu/kiv/eegdatabase/wui/ui/experiments/AddExperimentEnvironmentForm.java