github branch
Merge branch 'github'
remove gluon from web2py
xml2dict