add class-file; add template-file
merged something
add comments
Merge branch 'following-widget'