resident finalized
Merge remote-tracking branch 'origin/web-doing' into web-doing

Conflicts:

	HauntedHouses/Client/src/main/java/cz/muni/fi/pa165/client/MainForm.java