Merge pull request #27 from Connexions/cnx-archive-integration

cnx-archive integration
Merge branch 'master' into advanced-search