Pre-merge commit
Merge branch 'master' of https://github.com/gdevine/sampleTracker
Bring in view parent
ReAdded solr/test directory