* master:
  Delete and move ES aliases
  ES admin buttons moved
  Feature #30601. Implemented controller and view at /admin/elastic. Created action "/" for viewing list of indexes and their aliases. Related actions moved from AdminController class.

# Conflicts:
#	src/main/java/org/genesys2/server/servlet/controller/admin/ElasticSearchController.java
#	src/main/webapp/WEB-INF/jsp/admin/elastic/index.jsp

Aleksandr Sharaban authored Apr 11, 2016 and Matija Obreza committed Apr 20, 2016

Feature #30601. Implemented controller and view at /admin/elastic. Created action "/" for viewing list of indexes and their aliases. Related actions moved from AdminController class.

* master:
  MCPDUtil#toStrings fixed and renamed to #toList
  Always update lastModifiedDate with REST upsert operation
  ElasticUpdaterProcessor uses @Scheduled annotation instead of own background thread
  opencsv upgraded

* commit 'bff07d26':
  Handle BINARY(16) as UUID in Downloads
  Fixed ReCaptcha problem (#51 Unable to send request for germplasm)

Aleksandr Sharaban authored Apr 11, 2016 and Matija Obreza committed Apr 11, 2016

Feature #30601. Implemented controller and view at /admin/elastic. Created action "/" for viewing list of indexes and their aliases. Related actions moved from AdminController class.

* master:
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release genesys2-server-1.1.0
  Made Elasticsearch HTTP configurable
  Allow for configuration of Elasticsearch and Hazelcast clusters
  Regenerate ES index in batch mode
  Unlinked entity PDCI from AccessionId
  Using aliases for ES indexes
  Make entity Crop cacheable
  Added /c/ to list all crops and included CROPNAME in Excel MCPD export
  Use MCPD#cropName instead of taxonomy to determine crop of accession
  Accession passport data basics updated