Merge branch 'master' of https://github.com/mdipierro/web2py-book
Further minor improvements to using IS_IN_SET to force a checkbox to be ticked
Further minor improvements to using IS_IN_SET to force a checkbox to be ticked
Merge branch 'master' of https://github.com/mdipierro/web2py-book
Merge branch 'master' of https://github.com/timrichardson/web2py-book
Update 01.markmin
Update 01.markmin
Update 01.markmin

correções ortográficas
Update 01.markmin
Update 01.markmin
Update 01.markmin
Update 01.markmin

por que web2py?
Update 01.markmin

Segurança
Update pt-br.py
Fixed typos in Section 1.7 in Chapter 4 and 13 descriptions.
typo in static asset management patch, thanks Niphlod
Explain the use of links to display virtual fields in grids
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'upstream'

Conflicts:
	sources/29-web2py-english/07.markmin