opraveno pro extended em
Merge remote-tracking branch 'origin/master'
opraveno přidávání/odebírání pro extended em
poslední úprava před zkouškou
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Planovac/src/main/java/cz/uhk/planovac/web/SkupinaForm.java
	Planovac/src/main/java/cz/uhk/planovac/web/UdalostForm.java
	Planovac/src/main/resources/mysql/populateDB.txt
	Planovac/src/main/webapp/WEB-INF/spring/spring-security.xml
	Planovac/src/main/webapp/WEB-INF/views/skupina.jsp
	Planovac/src/main/webapp/WEB-INF/views/udalost.jsp
	Planovac/src/main/webapp/WEB-INF/views/udalosti.jsp
	Planovac/src/main/webapp/WEB-INF/views/vyhledaneTerminy.jsp
	Planovac/target/classes/mysql/populateDB.txt
Merge branch 'master' of https://github.com/dpii/Planovac.git