Changed User Info because of username/email ambiguity
Merge branch 'master' of https://github.com/jandoubek/fjfi-planovac