Appparty 15 improve funnel

Hello,

A big merge conflict occurred in the guest.js file of the 'guest'. I resolved this issue and applied the same code to the 'guest_android' guest.js file. I also fixed a bug I discovered later about the info rotation of an Item. 

The Funnel should be fully functional now. 

I also rebased my commits to a single commit after the commits made by Eelco.