Merged in Mark/Antonio's update from winter

also reset index.php to "logged in"