fix merge conflicts.
Fix merge conflicts. Add spacing between checkboxes. Make SSN, Birthday, and Phone inputs uniformly aligned. Increase size of textview. Fix new form bug.
fix period in javadocs.
javadoc style tweaks.
fix optional edittexts disappearing on backtrack bug
Merge pull request #149 from calblueprint/byron/fix_new_form_bug_and_make_style_tweaks

Byron/fix new form bug and make style tweaks
Merge pull request #157 from calblueprint/byron/optional_edittext_disappear_bug

fix optional edittexts disappearing on backtrack bug
fix merge conflicts