Merge remote-tracking branch 'upstream/develop' into develop

* upstream/develop:
  Update datasource.properties templates: - Add datasource.dao.identifier and connection.provider.identifier
  Use DatasourceDaoIdentifier for FeatureQueryHandler instead of ConnectionProviderIdentificator
  Update PostgreSQL-JDBC and PostGIS-JDBC versions to 9.3-1101-jdbc4 and 2.1.3
  Use envirocar-server instead of Hibernate OGM
  Current state
  Further changes and implementations for enviroCar support: - add datasource DAO identification, required for same session factory but different DAO implementations - add default Hibernate OGM datasource and session factory - add enviroCar structure
  Add datasource identification to DAOs/ConnectionProvider: - the webapp contains different datasource types, e.g. Hibernate, netCDF file, ... - load only the DAOs/ConnectionProvider that have the same identificcation as during the installation selected
create a composite exception from all SQL exceptions
Merge pull request #62 from autermann/feature/better-sql-exceptions

Better SQL Exceptions