minor fixes
resolve conflicts
adds animation to restaurant call