Added template for editProperty.
Fixed merge conflicts.