Merge pull request #1385 from diegosarmentero/master

forwarding current editor changed
Merge pull request #1386 from diegosarmentero/master

Several improves in CodeEditor and contextual menu for files
some fixes and adding shortcut to expand combo file