AlertView with course view support
AlertView with bookingView support
Merge branch 'Refactor' into develop