fix virtual fields with SQLFORM.grid fields=

Conflicts:
	gluon/sqlhtml.py
completed merge of virtual fields in fields arguemnt for SQLFORM.grid
This fixes SQLFORM.grid virtualfields with fields=
Merge pull request #252 from timrichardson/issue/1692v3

Issue/1692v3 OK merged my fix for virtual fields when fields argument is specified