Java 7 API crept in
CAY-1965 Change version from 3.2 to 4.0
CAY-1965 Change version from 3.2 to 4.0
cleanup before refactoring .. mostly generics-related
cleanup: unused var passed to non-public method
cleanup
CAY-1967 Deprecate SQLTemplate parameter batches
Merge branch 'master' into develop-devacfr

* master:
  CAY-1967 Deprecate SQLTemplate parameter batches
  cleanup
  cleanup: unused var passed to non-public method
  cleanup before refactoring .. mostly generics-related
  CAY-1965 Change version from 3.2 to 4.0
  CAY-1965 Change version from 3.2 to 4.0
  Java 7 API crept in

Conflicts:
	cayenne-di/src/main/java/org/apache/cayenne/di/AdhocObjectFactory.java
	cayenne-di/src/main/java/org/apache/cayenne/di/ClassLoaderManager.java
	cayenne-di/src/main/java/org/apache/cayenne/di/DIRuntimeException.java
	cayenne-di/src/main/java/org/apache/cayenne/di/spi/DefaultClassLoaderManager.java
	cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java