minor code change to user_accept_terms, removed return to main.html page
changed the way we set the person affiliation such that the only values possible are generic, student, employee
changed code to allow users who have XID's but are in the whitelist to have access