Merge branch 'feature-client-side' into feature-cancelAvailability
wip
fixing cancelling abilities
Merge branch 'feature-cancelAvailability' into develop
fixing booking integration test to not be db dependent
probably working, gotta double check
moving wait dialogs into separate files for DRY standards
fixing unit tests
fixed timing bug
data is rendered on homepage now
Merge branch 'feature-pendingRequestBug' into develop
fixing things that seemed odd
adding confirm booking functionality and empty faq page
Merge branch 'develop' into feature-client-side

Conflicts:
	src/main/java/com/surgeryassist/services/impl/HomepageServiceImpl.java
	src/main/webapp/WEB-INF/flows/inputAvailability/inputAvailabilities.xhtml
tying in the back end