fixed previous commit error
fixed issue with multiple string expressions in select
fixed issue 1294, thanks Vincent Chevrier
fixed issue 1295, more git issues, thanks Alan
attempt to fix issue 1296, ipv6 header parsing
allows modifiers in parse_as _rest, thanks Denes
fixed incorrect template validator in wiki, thanks Alan
commented unwanted style info in admin
json-rpc2 support, thanks Michele
fixed tkMessageBox problem, thanks Bruno
fixed json odd behavior
Adapter.native_json
fixed IS_JSON, thanks Alan
fixed font-family in codemirror, thanks Mariano
reverted 4622 codemirror3 because broke zencoding and drops support for IE7, we do not use the new features anyway. Sorry
fixed gevent monkey patching problem, thank you JimK
merge with upstream