#12 Refactor methods in DtoFactoryService
Merge branch 'whp12' of https://github.com/felipeq/whp-mTraining into whp12

Conflicts:
	mtraining/src/main/java/org/motechproject/whp/mtraining/service/impl/DtoFactoryServiceImpl.java