Merge pull request #16 from priyankadudani/master

Test cases for entityProcessors.
Fixed tokenization
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
merged
Merge pull request #20 from vamshiImaginea/master

fieldsets merging
working code
Merge pull request #21 from vamshiImaginea/master

working code
fix joins- add not matching rows even
Merge pull request #22 from vamshiImaginea/master

fix joins- add not matching rows even
Added indexes
Merge pull request #23 from vamshiImaginea/master

Added indexes
Adding new document
Merge branch 'master' of https://github.com/aditya-imaginea/solrlite

Conflicts:
	subsolr/logs/ssubsolr.log
	subsolr/logs/ssubsolr.log.1