Merge "merge webutil module from master branch" into template_2.0