Merge pull request #27 from robertpanzer/master

Fix merging of loadOnStartup annotation values with web.xml metadata
Rollback a part of previous merge. Fix JBMETA-346.
JBMETA-345: implement transaction timeout
JBMETA-345: fix NPE
[maven-release-plugin] prepare release 7.0.0.Beta30
[maven-release-plugin] prepare for next development iteration
JBMETA-348: fix test case
[maven-release-plugin] prepare release 7.0.0.Beta31
[maven-release-plugin] prepare for next development iteration
JBMETA-347: upgraded to jboss-ejb3-ext-api 2.0.0-beta-2 and removed code using pruned API
Allow for environment entries to be defined in jboss-app.xml
[maven-release-plugin] prepare release 7.0.0.Beta32
[maven-release-plugin] prepare for next development iteration
JBMETA-351 Missing parser support for replication-config and passivation-config
AS7-3373 around-timeout tag in ejb-jar.xml throws RuntimeException "around-timeout element parsing is not yet implemented"
[maven-release-plugin] prepare release 7.0.0.Beta33
[maven-release-plugin] prepare for next development iteration
Fix for AS7-3346.
Added test case demonstrating ClassCastException happening during merge of EJB 2 and 3 metadata
JBMETA-343 / JBMETA-349 / JBMETA-350: Fixed merging of descriptors with Entity and MessageDriven beans