add history view for customer.
Add an 'or' condition in 'where' clause for inactive appointments in customer controller.
remove includes from thinking sphinx search.
Add calendar view for staff.
Merge commit from sprint-3 into staff-login
CR fixes
CR Fixes
Merge pull request #14 from vinsol/staff-login

Staff login