Merge "Add access modifiers to htmlform classes"