bunch of changes
sytax error with html
Merge branch 'master' into registration_cleanup