def -> def_erfd
Merge remote-tracking branch 'origin/dev'

Conflicts:
	src/entities/Task.java
Merge remote-tracking branch 'origin/dev'