removed conflict from languages, thanks Niphlod
Merge branch 'master' of github.com:web2py/web2py
Merge branch 'master' of github.com:web2py/web2py
Merge branch 'master' of github.com:web2py/web2py
fixed issue 1795:MongoDB: DAL instantiation dict definition error, thanks Alan