Comenzando con la adaptación de la API a las nuevas rutas.
Merge branch 'dev' of github.com:alessandrofg/miRutina into dev

Conflicts:
	miRutinaWeb/config/routes.rb
Solucionando fallos en los tests.
Merge branch 'dev' of github.com:alessandrofg/miRutina into dev

Conflicts:
	miRutinaWeb/app/views/routines/edit.html.erb
	miRutinaWeb/app/views/routines/index.html.erb
	miRutinaWeb/app/views/routines/show.html.erb