FIX: fix converter
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/main/java/com/engagepoint/university/messaging/dto/EmailDTO.java
FIX: fix converter