Using new taxonomy method, TAX-37
Changing interface slightly TAX-37
Setting pom for dependencies
Merge branch 'master' into dev/TAX-37
Merge remote-tracking branch 'origin/dev/TAX-37' into release/2.6.0rc

Conflicts:
	base/pom.xml
	base/src/main/java/org/ambraproject/service/article/AIArticleClassifier.java
	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