Merge branch 'develop' into page-proofs
correct login and register style
Merge branch 'page-proofs' into develop
Merge branch 'develop' of https://github.com/7bits/probation-bicycle-ways into develop