template bugs fixed
ui
fixed form validation on profile page
Merge branch 'master' into develop