# Conflicts:
#	src/main/java/com/ejweb/modules/report/service/ReportService.java
#	src/main/java/com/ejweb/modules/report/web/ReportController.java
#	src/main/java/com/ejweb/modules/report/web/ReportToWordController.java
#	src/main/resources/ejweb.properties
#	src/main/resources/mappings/modules/report/CtBbtcTypeAreaDao.xml