fixed f5565a91 template caching ssettings
fixed sql-debugger display toggling
Merge branch 'master' into next