misc...
Merge
Merge branch 'master' of github.com:CompanyBook/index_admin into feature/server_to_solr_server_relations

Conflicts:
	lib/remote_server.rb