remove accidental html in header
resolve merge conflicts for .idea/workspace.xml
add secret_key_base for demo env
mend

set config.assets.compile to true for demo env
mend

test demo env detection on heroku
segregate shows and show importing to seperate controllers
allow user to set directory when importing files from ftp server