update

added dafault values for combobox
Merge branch 'master' of https://github.com/acanedairri/StrasaWeb