fix requiredLabel
fix css class
fix css class 2
fix id
Merge branch 'develop'