Roles
Idk what to do when conflicts

Conflicts:
	src/main/java/wepa/controller/ReportController.java