Merge pull request #1 from paulasmuth/master

update to match upstream
make the changes from ad0c6e6c69c0e102f55750320cdac4595f6c01e4 and 99cfe75a40a11d49f23de8137a6e44ddebe0ec35 in the correct place
allow the LIST command to work if the key Set is empty (just return "null")
Merge pull request #158 from sazze/master

Make javascript UI changes in the correct location