#4 logic berichtigt
Merge branch 'master' of https://github.com/britzke/shareezy.git
Merge branch 'master' of https://github.com/britzke/shareezy.git