Merge pull request #11 from cristiroma/master

fixes #2519 - data directory is now read from config.json
Merge pull request #14 from cristiroma/ticket_2506

Ticket 2506 - Configured Solr environment