new version 3.3-SNAPSHOT

Signed-off-by: Gregory Jansen <count0@email.unc.edu>
Add "published" attribute to acl schema
Modify schematron to assert that a metsHdr element must be present
Add a failing mets validation test against expected output from the forms app
Relax assertion for agent to require only CREATOR role, add defaultWebObject and hasSupplemental as values for smLink arcrole attributes.
Add <isPublished>no</isPublished> to RELS-EXT when acl:published attribute in administrative metadata is false.
Add defaultWebObject to list of predicates
fix for NPE on CDR fesl cache invalidation
In the hierarchical browse view, hidden folders with visible contents now display the contents as if the folder were not there, which fixxes cdr-129.  The base 'browse' header link now correctly goes to the collection browse page again.  SolrUpdateServiceTest actually making assertions now.
Removed extraneous sorting of facet categories, leaving it to the order of the facet fields in the request to set order.  All the maps and sets in SearchSettings declared as generic interfaces.
Display collection placeholder image instead of the fake thumbnails from the static folder now.  Browse link from container full record page correctly going to just the first tier of results again.  Turned logging back down to warn.
Fedora content streaming prioritizing fedora headers for content length and mimetype over those from solr when present and valid to avoid getting incorrect data back when requesting datastreams before the object they belong to has been updated in Solr.  Cleaned up some system.out statements
Preventing an out of bounds exception from occurring when only 1 column is found for an entry in the list of worked files when populating the ingest monitor.  Turned down solr ingest logging for services
Using the display department field for facet lists
Fixed about page links to use the scontent path instead of external
Fix typo
Fix contact link on front page
Merge branch 'master' into 3.2.x

Conflicts:
	access-common/pom.xml
	access-common/src/main/java/edu/unc/lib/dl/ui/controller/FedoraContentController.java
	access-common/src/main/java/edu/unc/lib/dl/ui/service/FedoraContentService.java
	access/pom.xml
	access/src/main/resources/search.properties
	access/src/main/webapp/WEB-INF/jsp/searchResults/browseResultEntry.jsp
	access/src/main/webapp/WEB-INF/jsp/searchResults/searchResultEntry.jsp
	admin-review/pom.xml
	admin/pom.xml
	fcrepo-cdr-fesl/pom.xml
	fcrepo-clients/pom.xml
	fcrepo-irods-storage/pom.xml
	metadata/pom.xml
	metadata/src/test/resources/samples/bad-missing-mets-hdr.xml
	metadata/src/test/resources/samples/good-simple-form.xml
	persistence/pom.xml
	pom.xml
	security/pom.xml
	services/pom.xml
	solr-ingest/pom.xml
	solr-search/pom.xml
	solr-search/src/main/java/edu/unc/lib/dl/search/solr/service/SearchStateFactory.java
	sword-server/pom.xml
Merge branch '3.2.x' into admin-navigation