-
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
e06513fa