Merge pull request #21 from jfclere/master

Set default values
Fixed validation with enterprise-beans element
Augment the exception message.
JBMETA-341: initial work on merging of 3.0 session bean
JBMETA-340: fix NPE during merge of generic ejb
JBMETA-340: refactor the setup of session bean metadata and generic metadata
Merge pull request #22 from wolfc/JBMETA-341

Merge 3.0 descriptors with some fixes to the merging code itself
[maven-release-plugin] prepare release 7.0.0.Beta16
[maven-release-plugin] prepare for next development iteration
Update to version 7.0.0.Beta18-SNAPSHOT
JBMETA-340: reinstate JBMETA-301 test (without annotation scanning)
Deprecate old classes
JBMETA-340: fix regression
Ignore gitk tmp files
Implement IScheduleTarget as a temporary stop-gap (should not expose setters)
Added convenience method EnterpriseBeanMetaData.getEjbJarVersion
JBMETA-340: make sure a generic bean can actually do proper type substitution
[maven-release-plugin] prepare release 7.0.0.Beta18
[maven-release-plugin] prepare for next development iteration
Add merge function to JBossClientMetaData