Fixed some issues with transitions between views
Merge remote-tracking branch 'origin/master'
changed location mechanism to work with the location button
added KVO for play button to ensure it’s always in the right state.