Kateryna Kliushnyk authored Sep 30, 2013 and Matija Obreza committed Sep 30, 2013

Conflicts:
	crophub_oauth_client/src/main/java/org/crophub/auth/client/CropHubClient.java
	crophub_server_oauth/src/main/java/org/crophub/auth/server/utils/ServiceEndpoints.java
	crophub_server_oauth/src/main/resources/spring/auth-servlet.xml
	crophub_server_oauth/src/main/resources/spring/spring-security.xml

Kateryna Kliushnyk authored Sep 30, 2013 and Matija Obreza committed Sep 30, 2013

Conflicts:
	.gitignore
	crophub_oauth_client/pom.xml
	crophub_oauth_client/src/main/java/org/crophub/auth/client/CropHubClient.java
	crophub_server_oauth/pom.xml
	crophub_server_oauth/src/main/java/org/crophub/auth/server/controller/DataSetController.java
	crophub_server_oauth/src/main/java/org/crophub/auth/server/controller/LicensesController.java
	crophub_server_oauth/src/main/java/org/crophub/auth/server/controller/OrganizationController.java
	crophub_server_oauth/src/main/java/org/crophub/auth/server/controller/TraitsController.java
	crophub_server_oauth/src/main/java/org/crophub/auth/server/controller/UserController.java
	crophub_server_oauth/src/main/resources/database.properties
	crophub_server_oauth/src/main/resources/spring/spring-oauth.xml
	crophub_server_oauth/src/main/resources/spring/spring-security.xml
	crophub_server_oauth/src/main/webapp/login.jsp

language

* tests-to-migrate-to-head:
  Removed old runners
  SGSV data import
  Added SvalbardData entity
  Multiple "crops" possible
  Update In_Svalbard status from SGSV data

Conflicts:
	src/main/java/org/genesys2/rest/common/persistence/domain/SvalbardRepository.java
	src/main/java/org/genesys2/server/service/GenesysService.java
	src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java
	src/main/java/org/genesys2/server/service/impl/TaxonomyServiceImpl.java
	src/main/java/org/genesys2/server/servlet/controller/AdminController.java
	src/main/webapp/WEB-INF/jsp/admin/index.jsp
	src/test/java/org/crophub/rest/test/RestTest.java
	src/test/java/org/genesys2/server/test/RestTest.java
	src/test/java/org/genesys2/test/RestTest.java