improve contractacio form behaviour 8
improve contractacio form behaviour 9
Merge branch 'devel'