fix merge conflicts
update guest-side to properly work with voting (normal guest and guest_android)
fix bug 'info rotation', whereby info didn't rotate anymore after vote, should be properly rotating again
Merge branch 'APPPARTY-15-improve-funnel' of https://github.com/d3rr1/app-PartyPlayer into APPPARTY-15-improve-funnel