#80
#80
#80
Merge branch 'feature_80'

Conflicts:
	FlashCards_Service/src/main/java/org/robbins/flashcards/service/util/dozer/HibernateFieldMapper.java