Fixing freemarker error handling, wiring up old action
Merge branch 'master' into dev/SE-214
Changing service to use subjects field versus subject_level_1
URL Rewrite rules for browse subject page
Using builder pattern for searchHit class
Removing deprecated property
Removing deprecated property
Removing deprecated property, use new builder pattern for search hits
Merge branch 'master' into dev/FEND-901
Merging dev/new-etocs-alerts2
Removing bad code
Merge branch 'dev/FEND-902' into dev/FEND-901
Adding methods for creating a map from a structured list FEND-901
Updates to taxonomy service to create a map of taxonomic terms FEND-901
Merge branch 'master' into dev/FEND-901

Conflicts:
	base/pom.xml
	base/src/test/resources/org/ambraproject/action/nonWebApplicationContext.xml
	journals/pom.xml
	libs/ambra-emailer/pom.xml
	libs/conf-helper/pom.xml
	libs/dom-ranges-helper/pom.xml
	libs/entity-resolver/pom.xml
	libs/password-service/pom.xml
	libs/pom.xml
	models/pom.xml
	pom.xml
	queue/pom.xml
	webapp/pom.xml
	webapp/src/main/webapp/static/releaseNotes.ftl
Variable rename
Adding logic for reading in new configuration entry.  FEND-901
Adding service methods to store filtered journal alerts, FEND-901
Fixing failing test FEND-901
Creating new utility class, moving some methods around.  FEND-901