#2097: Use localStorage.length instead to get number of entries

It looks like some older browsers are not compatible with the keys()
function of jquery.storageapi, but are compatible with just
localStorage.length.
#2096: fix typo
fix typo
fix legacy json
fixes #2099
new version
fixes #2100
include dmail ip addrs in search
upgrade to rails 3.2.17
Merge remote-tracking branch 'upstream/master'