Default to solr 3.6.0
Merge branch 'master' of github.com:CompanyBook/index_admin into feature/server_to_solr_server_relations
Merge branch 'master' of github.com:CompanyBook/index_admin
Merge branch 'master' of github.com:CompanyBook/index_admin into feature/server_to_solr_server_relations