Initial commit
Merge branch 'master' of github.com:pcollaog/merge-properties-maven-plugin into develop

Signed-off-by: Francisco Collao Garate <francisco.collao@excelsys.net>

Conflicts:
	.gitignore
ADD: Configuration in README.md

Signed-off-by: Francisco Collao Garate <francisco.collao@excelsys.net>