Add new entity type form skeleton
Merge remote-tracking branch 'origin/master'