first batch of work on colida, basic home page, search, and show; no ingest yet
Merge remote-tracking branch 'origin/master'