Add additional options to trade log: none, console, file, console and file.
Pickup old version of the trade log option. Dlete this code in a while.
Fix use of set_var_unsaved()
Merge remote-tracking branch 'remotes/upstream/master'