Plan de supervisión generar las actividades paso 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Umeca/src/main/java/com/umeca/service/account/SharedUserService.java
	src/Umeca/src/main/webapp/WEB-INF/jsp/shared/menu.jsp
Merge branch 'master' of https://github.com/IDRASoft-P160-Um3c4/UmecaApp
Plan de supervisión generar las actividades paso 3
Merge remote-tracking branch 'origin/master'