added one view form class
Merge remote branch 'origin/master'