NW Add Category Controller
GIT NW Prueba
Merge origin/iniciallocaln into iniciallocal
Merge origin/iniciallocal into iniciallocal

Conflicts:
	target/classes/calendarservice/CalendarController.class
	target/stacktrace.log