Attempting to rewrite controller and templates with format
Corrected some bugs from changing formats
Merge branch 'develop' into import_betankanden