update layout sub-generator
update layout template
change version
Merge remote-tracking branch 'origin/master'