Merge branch 'jpa-persistence'
DAO beans now declared on top level

Moved the definition of the DAO-related beans to the top level. This means that
the XML file with the service-local configuration no longer directly includes
the DAO configuration. This allows a different DAO configuration to be used in
unit tests.
Merge branch 'refactor-spring-cfg'
Explicity servlet/JSP dependencies

No longer pulling in whole JavaEE 6 API. This became necessary in particular to
use spring transactions; there were some conflicts with the JTA api.
Runtime scope for spring-orm

This is not needed for compilation.