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.
Merge remote-tracking branch: upstream/master