Fix appointment listing and manage appointment
Merge remote-tracking branch 'origin/master'