First version of cover_image support
Fixing comment conflict
Merge branch 'master' of github.com:codeforamerica/tourserver
fixing merge error