Merge pull request #661 from rdsubhas/master

Refactoring Child views, Optimize rspec to hit Solr only when necessary
Updated Dockerfile
Further small refactorings of Child model