Merge branch 'master' of https://github.com/adamsamec/TimePool

Conflicts:
src/main/webapp/WEB-INF/properties/jdbc.properties
daf

sdf
fd

sssss
ahoj