login and registration style
Merge branch 'page-proofs' into develop
merge conflict
Merge branch 'page-proofs' into develop