Merge pull request #390 from BlythMeister/BetaVersion

Bug fixes
Move where visibility set, the holders are re-used, so this idea doesn't work
Merge remote-tracking branch 'Upstream/develop' into BetaVersion
Fix for #393 - Lock orientation to a sensor landscape, meaning the screen doesn't do an odd flip when in landscape mode.
Attempted fix for #396.  Try and prevent an infinate loop