Merge with uiexperiment

src/main/java/org/opendatakit/common/security/spring/Oauth2AuthenticationToken.java

@@ -25,6 +25,7 @@
 
 /**
  * Authentication that is returned by Oauth 2.0 processing.
+ * Structure liberally copied from Spring OpenId and Oauth2 authentication token classes.
  * 
  * @author mitchellsundt@gmail.com
  *

src/main/java/org/opendatakit/common/security/spring/Oauth2ResourceFilter.java

@@ -72,6 +72,8 @@
  * Ideally, we would have a custom scope in the Google Oauth 2.0 grant
  * for this Aggregate instance.  That is not yet possible.
  * 
+ * parseToken() is copied verbatim from Spring Security Oauth2 code.
+ * 
  * @author mitchellsundt@gmail.com
  *
  */

src/main/java/org/opendatakit/common/security/spring/TargetUrlRequestAwareAuthenticationSuccessHandler.java

@@ -31,7 +31,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Copied from SavedRequestAwareAuthenticationSuccessHandler
+ * Copied from Spring Security SavedRequestAwareAuthenticationSuccessHandler
  * Prefers using the redirect target URL (coming in as a query string parameter)
  * over the saved request URL.
  *