handling of unknown ids / codenames
fixed missing template error
tiny bugfix for edit_type
Merge branch 'edittypebug'
Merge branch 'master' into develop
Merge branch 'develop' into simple_stuff