Indent
update
update
Merge branch 'newBookingView' into Refactor

Conflicts:
	all/src/main/java/studymaster/all/ViewController/Director.java