fixes login form to be consistent.
pulling in changes to keep dev branch up to date.
Merge branch 'master' into Voting