Merge origin/master

Conflicts:
	src/edu/esprit/dao/MyDAO.java