Fixed  bug with updating elements
Merge branch 'geocat_1.1.x_stable' of github.com:camptocamp/geocat into geocat_1.1.x
Update strings.xml
Merge branch 'geocat_1.1.x' of github.com:camptocamp/geocat into geocat_1.1.x
Merge branch 'geocat_1.1.x_stable' into geocat_1.1.x