fixed demo mode
merge heads
Merge branch 'master' of github.com:web2py/web2py
reverted error commit