Added support for custom Java App layouts.
Fixed style issues.
Addressed code review comments
Fixed unit tests.
Fixed references to constants.
Addressed code review comments.
Merge pull request #383 from menivaitsi/java-layout-fix

Java layout fix