everything im doing now
Changes.
Merge branch 'master' of https://github.com/bzifkin/Proteus

Conflicts:
	homer/pom.xml
	homer/src/main/java/ciir/proteus/parse/NumScheme.java
	homer/src/main/java/ciir/proteus/parse/XMLTrimmer.java