index a hlasovani
new
Merge branch 'team1.1' of https://github.com/miloscz/skoleni into team1.1

Conflicts:
	Miss/target/m2e-wtp/web-resources/META-INF/maven/Miss/Miss/pom.properties
Merge branch 'team1.1' of https://github.com/miloscz/skoleni into team1.1