Removed resources :session from routes
Added structure to tools listing
Fixed login/logout and checked for merge conflict.
Fixed conflict.