Merge origin/master

Conflicts:
	src/DAL/FirefighterDAO.java