Added some dependencies
Merge branch 'master' into Amos/UMLS-normalization
Merge branch 'master' into Amos/UMLS-normalization

Conflicts:
	project-team02/pom.xml
Added UmlsToken that adds a field for the UMLS Term
Merge branch 'master' into Amos/UMLS-normalization

Conflicts:
	project-team02/src/main/java/team2/NLPProc.java
Merge branch 'Amos/UMLS-normalization'
Branch Merged: Amos + My changes
Minor Automerge Mistakes fixed