Solr Search on Storeprofiles added
Resloving merge conflicts