Merge pull request #17 from vamshiImaginea/master

Fixed tokenization
cleaning up
Merge remote-tracking branch 'origin/master'

Conflicts:
	subsolr/pom.xml
first cut merged field sets
Merge remote-tracking branch 'upstream/master'

Conflicts:
	subsolr/pom.xml
	subsolr/src/main/resources/com/subsolr/contextprocessors/DocumentContext.xml