Update strings.xml
Fixed several bugs with the reusable editor
Merge branch 'geocat_1.1.x_stable' into geocat_1.1.x