Merge branch 'master' of https://github.com/onkelangil/PvC-app

Reverted onkelangils changes! ;)