new login logic with drop down login using email address as ID
Changes to accommodate updates to the DB which made it more normalized.
changed the log in to be a drop down.
Merge with orgin/master