Completed commenting of View.java, fixed image for "Settings" in the prep tool
Merge remote-tracking branch 'origin/coderevision' into coderevision