1.0-b9j
resolve conflict
v1.0-b9k fix GAE issues
Merge pull request #2 from greenlaw110/master

v1.0-b9k fix GAE issues