New merge of devel with master

Minor changes in Lua names, coupling between `optimizer` and `trainable.supervised_trainer`