Changes before merging with Elwira
Merge branch 'master' of github.com:sacherus/partynow