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
Update to #59 regarding the suggestion by shane-axiom.
Now the SOS uses org.n52.sos.ds.Datasource property to load the defined class, e.g. org.n52.sos.ds.datasource.PostgresDatasource, in the Configurator and call the getter for ConnectionProviderIdentificator and DatasourceDaoIdentifier.
Merge pull request #61 from CarstenHollmann/update/datasource_dependent_dao_loading

Update to #59 regarding the suggestion by shane-axiom.
set C3P0 idle test timeout to 30s
use 'SELECT 1' as test query
create a composite exception from all SQL exceptions
Merge pull request #62 from autermann/feature/better-sql-exceptions

Better SQL Exceptions
Merge pull request #63 from autermann/fix/c3p0-idle-test-period

Raise C3P0 idle test period
implemented asynchronous cache serialization on updates
Merge pull request #64 from autermann/fix/cache-serialization-performance

Asynchronous cache serialization on updates
configurable write delay and non-blocking cache serialization
fixed non-utf8 encoding of JSP and escaped &deg;
Merge branch 'develop' of https://github.com/52North/SOS into develop

* 'develop' of https://github.com/52North/SOS:
  implemented asynchronous cache serialization on updates
  create a composite exception from all SQL exceptions
  use 'SELECT 1' as test query
  set C3P0 idle test timeout to 30s
  Update to #59 regarding the suggestion by shane-axiom. Now the SOS uses org.n52.sos.ds.Datasource property to load the defined class, e.g. org.n52.sos.ds.datasource.PostgresDatasource, in the Configurator and call the getter for ConnectionProviderIdentificator and DatasourceDaoIdentifier.
Merge pull request #65 from autermann/fix/cache-serialization-performance

Configurable write delay and non-blocking cache serialization
increment the project's Java version to 1.7
removed OpenJDK6 from Travis build matrix
Merge pull request #66 from autermann/feature/java-1.7

Switch to Java 7
enable Travis CI IRC notifications
removed obsolete profiles and activated all modules on default
removed all profiles except oracle and sqlserver