Revision 384619

Modified main manifest to use new version numbers (this needs to be automated)
and modified Felix and maven plugin to convert Maven versions into OSGi
versions by replacing the '-' with a '.' to separate the qualifier.