test
Merge remote-tracking branch 'github/mihai' into mihai
Treat lots in GAE: add, modify, delete