Fixed issue #522: Scope contamination when using multiple gridviews.
Fixed issue #506: Missing custom input types in the form builder.
Merge pull request #523 from SamMousa/master

Fix for reported issue #522