Fix login nav alignment. Fix merge conflict on brand.css
Merge branch 'theme' of https://github.com/edlinklater/loveyourwater_3 into theme