Pre merge commit
Merge branch 'master' of https://github.com/psal/anonymouth.git

Conflicts:
	src/edu/drexel/psal/anonymouth/engine/Attribute.java
	src/edu/drexel/psal/anonymouth/utils/ConsolidationStation.java
	src/edu/drexel/psal/anonymouth/utils/TaggedDocument.java
	src/edu/drexel/psal/anonymouth/utils/TaggedSentence.java
	src/edu/drexel/psal/anonymouth/utils/Word.java