fixed problem with tempfiles in Android, thanks Fernando Pacheco
optimizations. Switch to PyCrypto support in pbkdf2 when possible.
Merge pull request #136 from michele-comitini/speed_triks1

optimizations. Switch to PyCrypto support in pbkdf2 when possible.
fixed issue 1587:Mongodb error on id
fix issue 1592
fixed a problem in recent commit when pycrypto is missing, the fix is temporary
Merge pull request #138 from niphlod/issue/1592

fix issue 1592
Merge branch 'master' of github.com:web2py/web2py
removed pycrypto leaving only strxor for speeding up pbkdf2
files toggle in admin, maybe as Massimo would want it
fixed conflict
Merge pull request #140 from carpaIdea/master

files toggle in admin, maybe as Massimo would want it
fix for postgresql when using an alias.
admin - site page - small visual enhancements
possibly fixed a problem with virtualfields in fields option of SQLFORM.grid, thanks peckto
fixed issue 1594:radio widget layout conflicts with bootstrap, thanks Paolo Caruccio
synced web2py_bootstrap.css, fixed issue 1595:web2py_bootstrap.css in welcome, admin and examples app not in sync anymore, thanks lightdot
fixed issue 1591:Allow sql log customization
no more autocomplete for date/time inputs, thaks Paolo
Merge pull request #141 from carpaIdea/master

admin - site page - small visual enhancements