Commented/revised/TODO'd Layout.java, LayoutParser.java, LayoutParserException.java
Merge remote-tracking branch 'origin/coderevision' into coderevision