remover atributo simple sin terminar5
editar combo simple
Merge branch 'vincent_merge' of github.com:gitdb2/tdap2014 into vincent_merge
editar combo multi y refactor