repair controllers to integrate a test
rapair views files
change method is_login! to application_controller
code refactor
solve merge confic