First commit
Merge branch 'master' of github.com:pnael/web2py_testing