fix to undefined everything
Merge branch 'base_app' into beta_2
quick fix of contentEditable fix conflicting with empty fields
Merge branch 'base_app' into beta_2
extension of contenteditable and empty field fix