Merge origin/master

Conflicts:
	src/asw1009/viewmodel/request/LoginRequestViewModel.java