Merge branch 'biodiv_checklist' of https://github.com/kxt5258/biodiv into kxt5258-biodiv_checklist
Merge branch 'biodiv_checklist' of https://github.com/kxt5258/biodiv into kxt5258-biodiv_checklist
Changed solr ver and added indexConfig settings 2 solrconfig.xml files
Update SUserSearchService.groovy
Set offsets on users query when indexing to solr
Offsets for user querying when indexing to solr

Conflicts:
	grails-app/services/speciespage/search/SUserSearchService.groovy
Merge branch 'biodiv_checklist' of https://github.com/kxt5258/biodiv into kxt5258-biodiv_checklist
solr conf changes and userlist fix
Merge branch 'kxt5258-biodiv_checklist' into biodiv_checklist

Conflicts:
	application.properties
	grails-app/conf/BuildConfig.groovy
	userscripts/indexData.groovy