diff --git a/apps/dashboard-app/src/main/resources/reference.conf b/apps/dashboard-app/src/main/resources/reference.conf
index e1891c4f0..af6432c2c 100644
--- a/apps/dashboard-app/src/main/resources/reference.conf
+++ b/apps/dashboard-app/src/main/resources/reference.conf
@@ -1,47 +1,47 @@
 shrine {
-  admin {
+  dashboard {
     gruntWatch = false //false for production, true for mvn tomcat7:run . Allows the client javascript and html files to be loaded via gruntWatch .
     happyBaseUrl = "http://localhost:6060/shrine/rest/happy"
   }
 
   pmEndpoint {
     url = "http://changeme.com/i2b2/services/PMService/getServices" //"http://services.i2b2.org/i2b2/services/PMService/getServices"
     acceptAllCerts = true
     timeout {
       seconds = 1
     }
   }
 
   authenticate {
     realm = "SHRINE Steward API"
     usersource
       {
         type = "PmUserSource" //Must be ConfigUserSource (for isolated testing) or PmUserSource (for everything else)
-        domain = "set shrine.authenticate.usersource.domain to the PM authentication domain in admin.conf" //"i2b2demo"
+        domain = "set shrine.authenticate.usersource.domain to the PM authentication domain in dashboard.conf" //"i2b2demo"
       }
   }
 
   // If the pmEndpoint acceptAllCerts = false then you need to supply a keystore
   //  keystore {
   //    file = "shrine.keystore"
   //    password = "chiptesting"
   //    privateKeyAlias = "test-cert"
   //    keyStoreType = "JKS"
   //    caCertAliases = [carra ca]
   //  }
 }
 
 //todo typesafe config precedence seems to do the right thing, but I haven't found the rules that say this reference.conf should override others
 akka {
   loglevel = INFO
 
   //  log-config-on-start = on
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   //  logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
 }
 
 spray.servlet {
   boot-class = "net.shrine.dashboard.Boot"
   request-timeout = 30s
 }
 
diff --git a/apps/dashboard-app/src/main/scala/net/shrine/dashboard/DashboardService.scala b/apps/dashboard-app/src/main/scala/net/shrine/dashboard/DashboardService.scala
index a8c641574..8cd29e689 100644
--- a/apps/dashboard-app/src/main/scala/net/shrine/dashboard/DashboardService.scala
+++ b/apps/dashboard-app/src/main/scala/net/shrine/dashboard/DashboardService.scala
@@ -1,150 +1,150 @@
 package net.shrine.dashboard
 
 import akka.actor.{ActorSystem, Actor}
 import akka.event.Logging
 import net.shrine.authentication.UserAuthenticator
 
 import net.shrine.authorization.steward.OutboundUser
 import net.shrine.i2b2.protocol.pm.User
 import net.shrine.dashboard.httpclient.HttpClientDirectives.httpRequestWithUnmatchedPath
 import shapeless.HNil
 
 import spray.http.{HttpResponse, HttpRequest, StatusCodes}
 import spray.httpx.Json4sSupport
 import spray.routing.directives.LogEntry
 import spray.routing.{AuthenticationFailedRejection, Rejected, RouteConcatenation, Directive0, Route, HttpService}
 
 import org.json4s.{DefaultFormats, Formats}
 
 import scala.concurrent.ExecutionContext.Implicits.global
 
 // we don't implement our route structure directly in the service actor because
 // we want to be able to test it independently, without having to spin up an actor
 
 class DashboardServiceActor extends Actor with DashboardService {
 
   // the HttpService trait defines only one abstract member, which
   // connects the services environment to the enclosing actor or test
   def actorRefFactory = context
 
   // this actor only runs our route, but you could add
   // other things here, like request stream processing
   // or timeout handling
   def receive = runRoute(route)
 }
 
 
 // this trait defines our service behavior independently from the service actor
 trait DashboardService extends HttpService with Json4sSupport {
   implicit def json4sFormats: Formats = DefaultFormats
 
   val userAuthenticator = UserAuthenticator(DashboardConfigSource.config)
 
   //don't need to do anything special for unauthorized users, but they do need access to a static form.
   lazy val route:Route = gruntWatchCorsSupport{
     staticResources ~ makeTrouble ~ about ~ authenticatedInBrowser
   }
 
   // logs just the request method, uri and response at info level
   def logEntryForRequestResponse(req: HttpRequest): Any => Option[LogEntry] = {
     case res: HttpResponse => {
       Some(LogEntry(s"\n  Request: $req \n  Response: $res", Logging.InfoLevel))
     }
     case _ => None // other kind of responses
   }
 
   // logs just the request method, uri and response status at info level
   def logEntryForRequest(req: HttpRequest): Any => Option[LogEntry] = {
     case res: HttpResponse => {
       Some(LogEntry(s"\n  Request: $req \n  Response status: ${res.status}", Logging.InfoLevel))
     }
     case _ => None // other kind of responses
   }
 
   //pathPrefixTest shields the QEP code from the redirect.
   def authenticatedInBrowser: Route = pathPrefixTest("user"|"admin") {
     logRequestResponse(logEntryForRequestResponse _) { //logging is controlled by Akka's config, slf4j, and log4j config
       reportIfFailedToAuthenticate {
         authenticate(userAuthenticator.basicUserAuthenticator) { user =>
           pathPrefix("user") {
             userRoute(user)
           } ~
             pathPrefix("admin") {
               adminRoute(user)
             }
         }
       }
     }
   }
 
   val reportIfFailedToAuthenticate = routeRouteResponse {
     case Rejected(List(AuthenticationFailedRejection(_,_))) =>
       complete("AuthenticationFailed")
   }
 
   def makeTrouble = pathPrefix("makeTrouble") {
     complete(throw new IllegalStateException("fake trouble"))
   }
 
   lazy val staticResources = pathPrefix("client"){
     logRequestResponse(logEntryForRequest _){
         getFromResourceDirectory("client")
       } ~ pathEnd {
         redirect("shrine-dashboard/client/index.html", StatusCodes.PermanentRedirect) //todo pick up the top of the url from context instead of hard-coded "shrine-dashboard"
       } ~ path( "index.html" ) {
         redirect("client/index.html", StatusCodes.PermanentRedirect)
       } ~ pathSingleSlash {
         redirect("client/index.html", StatusCodes.PermanentRedirect)
     }
   }
 
   lazy val about = pathPrefix("about") {
     complete("Nothing here yet") //todo
   }
 
   def userRoute(user:User):Route = get {
     pathPrefix("whoami") {
       complete(OutboundUser.createFromUser(user))
     }
   }
 
   //todo is this an admin? Does it matter?
   def adminRoute(user:User):Route = get {
     pathPrefix("happy") {
-      val happyBaseUrl = DashboardConfigSource.config.getString("shrine.admin.happyBaseUrl")
+      val happyBaseUrl = DashboardConfigSource.config.getString("shrine.dashboard.happyBaseUrl")
       implicit val system = ActorSystem("sprayServer")
 
       httpRequestWithUnmatchedPath(happyBaseUrl)
     }
   }
 
 }
 
 //adapted from https://gist.github.com/joseraya/176821d856b43b1cfe19
 object gruntWatchCorsSupport extends Directive0 with RouteConcatenation {
 
   import spray.http.HttpHeaders.{`Access-Control-Allow-Methods`, `Access-Control-Max-Age`, `Access-Control-Allow-Headers`,`Access-Control-Allow-Origin`}
   import spray.routing.directives.RespondWithDirectives.respondWithHeaders
   import spray.routing.directives.MethodDirectives.options
   import spray.routing.directives.RouteDirectives.complete
   import spray.http.HttpMethods.{OPTIONS,GET,POST}
   import spray.http.AllOrigins
 
   private val allowOriginHeader = `Access-Control-Allow-Origin`(AllOrigins)
   private val optionsCorsHeaders = List(
     `Access-Control-Allow-Headers`("Origin, X-Requested-With, Content-Type, Accept, Accept-Encoding, Accept-Language, Host, Referer, User-Agent, Authorization"),
     `Access-Control-Max-Age`(1728000)) //20 days
 
-  val gruntWatch:Boolean = DashboardConfigSource.config.getBoolean("shrine.admin.gruntWatch")
+  val gruntWatch:Boolean = DashboardConfigSource.config.getBoolean("shrine.dashboard.gruntWatch")
 
   override def happly(f: (HNil) => Route): Route = {
     if(gruntWatch) {
       options {
         respondWithHeaders(`Access-Control-Allow-Methods`(OPTIONS, GET, POST) ::  allowOriginHeader :: optionsCorsHeaders){
           complete(StatusCodes.OK)
         }
       } ~ f(HNil)
     }
     else f(HNil)
   }
 }
diff --git a/apps/dashboard-app/src/test/resources/log4j.properties b/apps/dashboard-app/src/test/resources/log4j.properties
index d4b45f8d4..05223de6b 100644
--- a/apps/dashboard-app/src/test/resources/log4j.properties
+++ b/apps/dashboard-app/src/test/resources/log4j.properties
@@ -1,19 +1,19 @@
 # LOG Pattern Layouts are covered here: http://logging.apache.org/log4j/docs/api/org/apache/log4j/PatternLayout.html
 
 # ROOT CONFIGURATION
 log4j.rootLogger=info, R
 log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.R.DatePattern='.'yyyy-MM-dd
-log4j.appender.R.File=logs/shrine-admin.log
+log4j.appender.R.File=logs/shrine-dashboard.log
 log4j.appender.R.layout=net.shrine.log.CustomPatternLayout
 log4j.appender.R.layout.ConversionPattern=%d{yyyy-MMM-dd-HH:mm:ss.SSS} %p [ROOT][%c{1}][%t] %m %n %throwable
 
 # Shrine
 log4j.logger.net.shrine=debug, shrine
 log4j.additivity.net.shrine=false
 log4j.appender.shrine=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.shrine.DatePattern='.'yyyy-MM-dd
-log4j.appender.shrine.File=logs/shrine-admin.log
+log4j.appender.shrine.File=logs/shrine-dashboard.log
 log4j.appender.shrine.layout=net.shrine.log.CustomPatternLayout
-log4j.appender.shrine.layout.ConversionPattern=%d{yyyy-MMM-dd-HH:mm:ss.SSS} %p [SHRINE][%c{1}][%t] %m %n %throwable
+log4j.appender.shrine.layout.ConversionPattern=%d{yyyy-MMM-dd-HH:mm:ss.SSS} %p [DASHBOARD][%c{1}][%t] %m %n %throwable
 
diff --git a/apps/dashboard-war/src/main/resources/reference.conf b/apps/dashboard-war/src/main/resources/reference.conf
index c033e30d0..4b089eb02 100644
--- a/apps/dashboard-war/src/main/resources/reference.conf
+++ b/apps/dashboard-war/src/main/resources/reference.conf
@@ -1,47 +1,47 @@
 shrine {
-  admin {
+  dashboard {
       gruntWatch = false //false for production, true for mvn tomcat7:run . Allows the client javascript and html files to be loaded via gruntWatch .
 
   }
 
   pmEndpoint {
     url = "http://changeme.com/i2b2/services/PMService/getServices" //"http://services.i2b2.org/i2b2/services/PMService/getServices"
     acceptAllCerts = true
     timeout {
       seconds = 1
     }
   }
 
   // If the pmEndpoint acceptAllCerts = false then you need to supply a keystore
   //  keystore {
   //    file = "shrine.keystore"
   //    password = "chiptesting"
   //    privateKeyAlias = "test-cert"
   //    keyStoreType = "JKS"
   //    caCertAliases = [carra ca]
   //  }
 
   authenticate {
     realm = "SHRINE API"
     usersource
       {
         type = "PmUserSource" //Must be ConfigUserSource (for isolated testing) or PmUserSource (for everything else)
-        domain = "set shrine.authenticate.usersource.domain to the PM authentication domain in admin.conf" //"i2b2demo"
+        domain = "set shrine.authenticate.usersource.domain to the PM authentication domain in dashboard.conf" //"i2b2demo"
       }
   }
 }
 
 //todo typesafe config precedence seems to do the right thing, but I haven't found the rules that say this reference.conf should override others
 akka {
   loglevel = INFO
 
 //  log-config-on-start = on
   loggers = ["akka.event.slf4j.Slf4jLogger"]
 //  logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
 }
 
 spray.servlet {
   boot-class = "net.shrine.dashboard.Boot"
   request-timeout = 30s
 }
 
diff --git a/commons/auth/src/test/resources/admin.conf b/commons/auth/src/test/resources/dashboard.conf
similarity index 100%
rename from commons/auth/src/test/resources/admin.conf
rename to commons/auth/src/test/resources/dashboard.conf
diff --git a/commons/auth/src/test/scala/net/shrine/authentication/ConfigUserSourceTest.scala b/commons/auth/src/test/scala/net/shrine/authentication/ConfigUserSourceTest.scala
index c9b90a5ea..97a5424a7 100644
--- a/commons/auth/src/test/scala/net/shrine/authentication/ConfigUserSourceTest.scala
+++ b/commons/auth/src/test/scala/net/shrine/authentication/ConfigUserSourceTest.scala
@@ -1,23 +1,23 @@
 package net.shrine.authentication
 
 import com.typesafe.config.ConfigFactory
 import net.shrine.util.ShouldMatchersForJUnit
 import org.junit.Test
 
 /**
  * @author david 
  * @since 8/12/15
  */
 class ConfigUserSourceTest extends ShouldMatchersForJUnit {
 
   @Test
   def testIsAuthenticated {
 
-    val config = ConfigFactory.load("admin")
+    val config = ConfigFactory.load("dashboard")
 
     val userSource = ConfigUserSource.apply(config)
 
     userSource.qepUserName should equal("qep")
   }
 
 }
diff --git a/pom.xml b/pom.xml
index 6f4b79b4e..dbbfa1102 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,361 +1,361 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<name>SHRINE</name>
 	<groupId>net.shrine</groupId>
 	<artifactId>shrine-base</artifactId>
 	<packaging>pom</packaging>
 	<version>1.20.0-SNAPSHOT</version>
 	<!-- -->
         <properties>
 			<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 			<spring.version>4.1.6.RELEASE</spring.version>
 			<lift-version>2.6.2</lift-version>
 			<scala-version>2.11.7</scala-version>
 			<scala-major-version>2.11</scala-major-version>
 			<junit-version>4.12</junit-version>
 			<slf4j-version>1.7.12</slf4j-version>
 			<log4j-version>1.2.17</log4j-version>
 			<jersey-version>1.19</jersey-version>
 			<scalatest-version>2.2.5</scalatest-version>
 			<scala-maven-plugin-version>3.2.0</scala-maven-plugin-version>
 			<squeryl-version>0.9.6-RC3</squeryl-version>
 			<typesafe-config-version>1.2.1</typesafe-config-version>
 			<h2-version>1.4.185</h2-version> <!-- 1.4.185 is the best we can do. 1.4.187 is current. Some change in 1.4.186 breaks the data steward -->
 			<easymock-version>3.3.1</easymock-version>
 			<mysql-version>5.1.35</mysql-version> <!-- Go to 5.1.35 once you figure out how to validate it -->
 			<opencsv-version>2.3</opencsv-version>
 			<servlet-api-version>3.0.1</servlet-api-version><!-- for tomcat 8, use 3.1.0 -->
 			<scallop-version>0.9.5</scallop-version>
 			<spray-version>1.3.3</spray-version>
 			<akka-version>2.3.8</akka-version>
 			<akka-testkit-version>2.3.11</akka-testkit-version>
 			<json4s-version>3.2.11</json4s-version>
 			<slick-version>3.0.0</slick-version>
         </properties>
 	<!-- -->
 	<modules>
 		<module>apps/dashboard-app</module>
 		<module>apps/dashboard-war</module>
 		<module>apps/steward-app</module>
 		<module>apps/steward-war</module>
 		<module>apps/proxy</module>
 		<module>apps/shrine-app</module>
 		<module>apps/war</module>
 		<module>qep/service</module>
 		<module>hub/broadcaster-aggregator</module>
 		<module>hub/broadcaster-service</module>
 		<module>adapter/adapter-api</module>
 		<module>adapter/adapter-service</module>
 		<module>hms-support</module>
 		<module>tools</module>
 		<module>commons/util</module>
 		<module>commons/auth</module>
 		<module>commons/protocol-query</module>
 		<module>commons/data-commons</module>
 		<module>commons/protocol</module>
 		<module>commons/crypto</module>
 		<module>commons/client</module>
 		<module>commons/config</module>
 		<module>commons/ont-support</module>
 		<module>commons/test-commons</module>
 		<module>install</module>
 		<module>integration</module>
 		<module>shrine-webclient</module>
 	</modules>
 	<!-- -->
 	<build>
 		<pluginManagement>
 			<plugins>
 				<plugin>
 					<groupId>net.alchim31.maven</groupId>
 					<artifactId>scala-maven-plugin</artifactId>
 					<version>${scala-maven-plugin-version}</version>
 					<executions>
 						<execution>
 							<goals>
 								<goal>compile</goal>
 								<goal>testCompile</goal>
 							</goals>
 						</execution>
 					</executions>
 					<configuration>
 						<!-- NB: recompileMode must be set to 'incremental' to get Zinc support; just 
 						     setting useZincServer to true won't do it :( -->
 						<recompileMode>incremental</recompileMode>
 						<useZincServer>true</useZincServer>
 						<jvmArgs>
 							<jvmArg>-XX:+AggressiveOpts</jvmArg>
 							<jvmArg>-XX:CompileThreshold=500</jvmArg>
 							<jvmArg>-XX:+UseFastAccessorMethods</jvmArg>
 							<jvmArg>-XX:+UseStringCache</jvmArg>
 							<jvmArg>-XX:+OptimizeStringConcat</jvmArg>
 							<jvmArg>-XX:+TieredCompilation</jvmArg>
 							<jvmArg>-XX:+UseConcMarkSweepGC</jvmArg>
 							<jvmArg>-XX:+DoEscapeAnalysis</jvmArg>
 							<jvmArg>-server</jvmArg>
 							<jvmArg>-Xms64m</jvmArg>
 							<jvmArg>-Xmx1024m</jvmArg>
 							<jvmArg>-XX:MaxPermSize=384m</jvmArg>
 						</jvmArgs>
 						<scalaVersion>${scala-version}</scalaVersion>
 						<args>
 							<arg>-Xcheckinit</arg>
 							<arg>-unchecked</arg>
 							<arg>-deprecation</arg>
 							<arg>-Xlint:adapted-args,inaccessible,infer-any,missing-interpolator,private-shadow,type-parameter-shadow,unsound-match</arg>
 							<!--<arg>-Xfatal-warnings</arg>-->
 						</args>
 					</configuration>
 				</plugin>
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
 						<source>1.6</source>
 						<target>1.6</target>
 					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>buildnumber-maven-plugin</artifactId>
 					<!-- use explicit version because 1.0-beta-4 came with borked checksums -->
 					<version>1.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>2.4</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-war-plugin</artifactId>
 					<version>2.1.1</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
 			<!-- This creates properties ${timestamp} and ${buildNumber} (the SCM 
 				revision number) -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>buildnumber-maven-plugin</artifactId>
 				<executions>
 					<execution>
 						<phase>validate</phase>
 						<goals>
 							<goal>create</goal>
 						</goals>
 					</execution>
 				</executions>
 				<configuration>
 					<timestampFormat>{0,date,yyyy-MM-dd HH:mm:ss}</timestampFormat>
 					<revisionOnScmFailure>(not available)</revisionOnScmFailure>
 				</configuration>
 			</plugin>
 			<!-- Add versioning information to jars and wars -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
 					<archive>
 						<manifest>
 							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 						</manifest>
 						<manifestEntries>
 							<SCM-Revision>${buildNumber}</SCM-Revision>
 							<SCM-Branch>${scmBranch}</SCM-Branch>
 							<buildDate>${timestamp}</buildDate>
 						</manifestEntries>
 					</archive>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
 					<archive>
 						<manifest>
 							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 						</manifest>
 						<manifestEntries>
 							<SCM-Revision>${buildNumber}</SCM-Revision>
 							<SCM-Branch>${scmBranch}</SCM-Branch>
 							<buildDate>${timestamp}</buildDate>
 						</manifestEntries>
 					</archive>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.tomcat.maven</groupId>
 				<artifactId>tomcat7-maven-plugin</artifactId>
 				<version>2.2</version>
 				<configuration>
 					<useTestClasspath>true</useTestClasspath>
 					<systemProperties>
 						<shrine.steward.gruntWatch>true</shrine.steward.gruntWatch>
 						<shrine.steward.database.createTablesOnStart>true</shrine.steward.database.createTablesOnStart>
-						<shrine.admin.gruntWatch>true</shrine.admin.gruntWatch>
-						<shrine.admin.happyBaseUrl>http://shrine-dev1.catalyst:6060/shrine/rest/happy</shrine.admin.happyBaseUrl>
+						<shrine.dashboard.gruntWatch>true</shrine.dashboard.gruntWatch>
+						<shrine.dashboard.happyBaseUrl>http://shrine-dev1.catalyst:6060/shrine/rest/happy</shrine.dashboard.happyBaseUrl>
 					</systemProperties>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
 	<!-- -->
 	<scm>
 		<connection>scm:svn:https://open.med.harvard.edu/svn/shrine/trunk/code</connection>
 		<developerConnection>scm:svn:https://open.med.harvard.edu/svn/shrine/trunk/code</developerConnection>
 		<url>https://open.med.harvard.edu/svn/shrine/trunk/code</url>
 	</scm>
 	<!-- -->
 	<repositories>
 		<!-- <repository> <id>CBMI-Nexus</id> <url>https://repo.open.med.harvard.edu/nexus/content/groups/public/</url> 
 			<snapshots> <enabled>true</enabled> </snapshots> <releases> <enabled>true</enabled> 
 			</releases> </repository> -->
 	</repositories>
 	<!-- -->
 	<pluginRepositories>
 		<pluginRepository>
 			<id>CBMI-Nexus</id>
 			<url>https://repo.open.med.harvard.edu/nexus/content/groups/public/</url>
 		</pluginRepository>
 	</pluginRepositories>
 	<!-- -->
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>com.typesafe</groupId>
 				<artifactId>config</artifactId>
 				<version>${typesafe-config-version}</version>
 			</dependency>
 			<dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
 				<version>${log4j-version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-jdbc</artifactId>
 				<version>${spring.version}</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>com.h2database</groupId>
 				<artifactId>h2</artifactId>
 				<version>${h2-version}</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.easymock</groupId>
 				<artifactId>easymock</artifactId>
 				<version>${easymock-version}</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-log4j12</artifactId>
 				<version>${slf4j-version}</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>mysql</groupId>
 				<artifactId>mysql-connector-java</artifactId>
 				<version>${mysql-version}</version>
 			</dependency>
 			<dependency>
 				<groupId>net.sf.opencsv</groupId>
 				<artifactId>opencsv</artifactId>
 				<version>${opencsv-version}</version>
 			</dependency>
 			<dependency>
 				<groupId>net.liftweb</groupId>
 				<artifactId>lift-json_${scala-major-version}</artifactId>
 				<version>${lift-version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.jersey</groupId>
 				<artifactId>jersey-server</artifactId>
 				<version>${jersey-version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.jersey</groupId>
 				<artifactId>jersey-servlet</artifactId>
 				<version>${jersey-version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.jersey</groupId>
 				<artifactId>jersey-client</artifactId>
 				<version>${jersey-version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.squeryl</groupId>
 				<artifactId>squeryl_${scala-major-version}</artifactId>
 				<version>${squeryl-version}</version>
 			</dependency>
 			<dependency>
 				<groupId>javax.servlet</groupId>
 				<artifactId>javax.servlet-api</artifactId>
 				<version>${servlet-api-version}</version>
 				<scope>provided</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<!-- -->
 	<dependencies>
 		<dependency>
 			<groupId>org.scala-lang</groupId>
 			<artifactId>scala-library</artifactId>
 			<version>${scala-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>${junit-version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.scalatest</groupId>
 			<artifactId>scalatest_${scala-major-version}</artifactId>
 			<version>${scalatest-version}</version>
 			<scope>test</scope>
 			<exclusions>
 				<!-- Exclude old (Scala 2.10.0) transitive dependencies -->
 				<exclusion>
 					<groupId>org.scala-lang</groupId>
 					<artifactId>scala-actors</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>org.scala-lang</groupId>
 					<artifactId>scala-reflect</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
 		<!-- Re-add transitive dependencies for ScalaTest with up-to-date Scala 
 			versions -->
 		<dependency>
 			<groupId>org.scala-lang</groupId>
 			<artifactId>scala-actors</artifactId>
 			<version>${scala-version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.scala-lang</groupId>
 			<artifactId>scala-reflect</artifactId>
 			<version>${scala-version}</version>
 		</dependency>
 	</dependencies>
 	<!-- -->
 	<distributionManagement>
 		<snapshotRepository>
 			<id>nexus</id>
 			<name>Nexus Repo</name>
 			<url>https://repo.open.med.harvard.edu/nexus/content/repositories/snapshots</url>
 			<uniqueVersion>false</uniqueVersion>
 		</snapshotRepository>
 		<repository>
 			<id>nexus</id>
 			<name>Nexus Repo</name>
 			<url>https://repo.open.med.harvard.edu/nexus/content/repositories/releases</url>
 		</repository>
 	</distributionManagement>
 </project>