Added okoa entity listener resolver for entity listener services
Spacing in yaml to 4 spaces
Updated scripthandler to remove itself when it's done
Updated generator bundle
Merge remote-tracking branch 'origin-github/master'