fix routing error
fix entities generator link
Merge remote-tracking branch 'origin/master' into kernerlEnhancement