merge feature files related to forms
resolve a conflict in the login_steps.rb
update feature test
delete unnecessary files.