Merge branch 'master' into concept

author Ray Lee <rhlee@berkeley.edu>

Sun, 8 Apr 2012 17:17:42 +0000 (10:17 -0700)

committer Ray Lee <rhlee@berkeley.edu>

Sun, 8 Apr 2012 17:17:42 +0000 (10:17 -0700)
author Ray Lee <rhlee@berkeley.edu>
Sun, 8 Apr 2012 17:17:42 +0000 (10:17 -0700)
committer Ray Lee <rhlee@berkeley.edu>
Sun, 8 Apr 2012 17:17:42 +0000 (10:17 -0700)
diff --cc services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
Simple merge
author	Ray Lee <rhlee@berkeley.edu>
	Sun, 8 Apr 2012 17:17:42 +0000 (10:17 -0700)
committer	Ray Lee <rhlee@berkeley.edu>
	Sun, 8 Apr 2012 17:17:42 +0000 (10:17 -0700)