html nota, y slickgrid una alerta modificada
Merge branch 'R3' of ssh://git@github.com/odea-examples/TimeTracker.git
into R3

Conflicts:
	src/main/java/com/odea/components/slickGrid/slickGridTemplate.js