enter action
Merge branch 'master' into login_view