Merge branch 'nginx-checkout' of https://github.com/nlake44/appscale
Merge branch 'master' of https://github.com/AppScale/appscale
Merge branch 'master' of https://github.com/AppScale/appscale
fix for ndb import
upgrade cassandra to 2.0.6
Merge pull request #1517 from nlake44/cassandra-upgrade

upgrade cassandra to 2.0.6
Merge pull request #1505 from AppScale/ndb_import_for_webapp

fix for ndb import
adding limit to zig zag queries
Merge pull request #1518 from AppScale/limit-on-zig-zag

Limit on zig zag queries