Merge pull request #1349 from diegosarmentero/master

first iteration of main container refactoring
some changes in neditable