Added a merge strategy for plugin.properties.
Merge pull request #2 from david04/patch-2

Added a merge strategy for plugin.properties.