Merge branch 'saving' into cleanup

Conflicts:
simsam_app/css/samlite.css
(removed; not needed here)
simsam_app/templates/sam.html
(add new clear button to this interface)