Modified meditime appointment booking
Merge branch 'master' into MEDIBASE-REMOVE