bad loop fix
state fix for back button
Merge branch 'master' of https://github.com/theeuks/scrollplayer