WIP: Postgres connection for srm entry table "cache"
WIP: Integrating the srm cache into the SRM workflow
Merge branch 'devel' into devel-localconfig-SRM-2-SRMCache

Conflicts:
	src/java/main/org/esgf/solr/model/DataCartFile.java
	src/java/main/org/esgf/solr/model/DatacartController.java
	src/java/main/org/esgf/solr/model/Solr.java
	src/java/main/org/esgf/srm/SRMUtils.java
Added refactored srm cache store implementation
WIP: Revised script generation
WIP: SRM Cache store interface work
WIP: Fixing the srm caching service
Revision of the SRM Cache controller interface
WIP: Refactoring the srm workflow
Merge branch 'devel' into devel-localconfig-SRM-2-SRMCache

Conflicts:
	src/java/main/org/esgf/solr/model/Solr.java
	src/java/main/org/esgf/srm/SRMEntryList.java
MBH: Working
Created new abstract properties reader and a reader for the srm properties
(properties readers for other parts of the front end, such as the facet properties reader, will be in a future release)
WIP: Initial setup of the srm cache db and handlers complete
Cosmetic cleanup of logging statements in srm cache workflow
WIP: URL Addressable datacart
1 - Uncommented imports for external scripts (CIM metadata and google maps)

2 - Cosmetic changes to ESDOC metadata viewer link
Merge remote-tracking branch 'origin/devel' into devel
corrected admin email address from esgf.properties on forgot password controller,
added the laoding spiiner to the account page when all groups registered
is loading, cleaned up line spacing.
MBH: fixing admin bugs from last release
Using servlet-api 3.0.x and excluding it from war artifact