added specific HTML attributes
fixed NPE in registration endpoint
Merge branch 'develop'