Merge origin/master

Conflicts:
	src/DAL/DALAppearance.java
	src/GUI/FiremenView.java