update -> merge_selectors_and_their_properties_smart.
- test commit for emails
- trunk / tags / branch folders