Merge branch 'master'
css adjustments in form error message
Merge branch 'jphernandez'