modified logout stuff and shopping card
successfull merge