mejora y correccion de errores en condiciones comerciales
conflicts en branchs test
v
pull
start in ubuntu
new view admin dispute ready
sori edited
edited js, model and controler
edited js, model and controler - new changes
new changes in styles on view admin.dispute
conflicts resolved
controller midifiqued
Merge branch 'adminDispute' of github.com:NEWLIFEVE/Etelix_SORI into adminDispute
Merge branch 'master' of github.com:NEWLIFEVE/Etelix_SORI
v 1.6
v1.6 conflicts resolved