removed conflicting code from logout and ret2prec weboptions
Merge remote-tracking branch 'origin'
updated to do list