added calendar plugin into forms
Merge origin/master