fixed a problem with the osgi manifest being included in two places in the fuse wars
Merge pull request #491 from EricWittmann/osgi-manifest

fixed a problem with the osgi manifest
SRAMP-569 Create maven plugin to merge .properties files