AH-532 Wiggle no more
Moved cheat buttons from code to user options
User options fix.
Merge remote-tracking branch 'origin/master' into AH-532_Wiggly_Toes