Added mockito.
Merge branch 'master' of https://github.com/aditya-imaginea/solrlite
Merge pull request #12 from vamshiImaginea/master

fixed indexing for sql entity mapping
Added CSV entity processor
Merge branch 'master' of https://github.com/priyankadudani/solrlite into priyankadudani-master

Conflicts:
	subsolr/src/main/resources/com/subsolr/contextprocessors/FieldContext.xml
Merge remote-tracking branch 'upstream/master'