diff
Merge branch 'master' of https://github.com/notarip/rutina

Conflicts:
	grails-app/views/rutina/create.gsp