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
fixed issue where zig zag was not being identified because list order matters, so changing to a set
Merge pull request #1483 from nlake44/zigzagfix

Awesome one-liner! Go on!
Added support for custom Java App layouts.
Addressed code review comments.
Fixed unit tests.
Addressed code review comments.
Merge pull request #1485 from menivaitsi/java-layout-fix

Added support for custom Java App layouts.
Fixed app id reference in LocalDatastoreService
Merge branch 'master' into appinventor-fix
Merge pull request #1489 from menivaitsi/appinventor-fix

Appinventor fix
Fixed path lookup to handle nested Java apps.
Merge pull request #1492 from menivaitsi/nested-java-apps

Fixed path lookup to handle nested Java apps.
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