allow config for: s3_host_name
fix error reporting on attempting to save content_block instances
fix bootstrap modal use for "add content"
fix bootstrap modal use for "edit form field"
Merge branch 'fix_exception_template'
Merge branch 'fix_add_content'