added layout-generator annotations
Merge branch 'master' into Production
added annotations to generate layouts