fixed some old feature files and created new batch feature files for appointments/users
fixed old feature files
resolved merge changes