Merge branch 'saving' into cleanup

Conflicts:
simsam_app/css/samlite.css
samlite has been factored out and reorganized.
simsam_app/templates/sam.html
Changes from saving already incorporated into sam.html