Added puzzle scrambler switcher (Referenced tnt-android code)
Merge remote-tracking branch 'origin/master'