merged

grails-app/conf/BootStrap.groovy

grails-app/conf/BuildConfig.groovy

grails-app/conf/DataSource.groovy

grails-app/controllers/scrumboard/SprintController.groovy

grails-app/controllers/scrumboard/UserStoryController.groovy

grails-app/domain/scrumboard/Task.groovy

grails-app/domain/scrumboard/UserStory.groovy

grails-app/domain/scrumboard/shiro/User.groovy

grails-app/taglib/scrumboard/MovableColumnTaskTagLib.groovy

...app/taglib/scrumboard/MovableColumnUserStoryTagLib.groovy

grails-app/taglib/scrumboard/NoteTaskTagLib.groovy

grails-app/taglib/scrumboard/NoteUserStoryTagLib.groovy

grails-app/taglib/scrumboard/ShowTaskDialogTagLib.groovy

...ls-app/taglib/scrumboard/ShowUserStoryDialogTagLib.groovy

grails-app/views/backlog/index.gsp

grails-app/views/sprint/show.gsp

grails-app/views/userStory/_showTask.gsp

test/unit/scrumboard/MovableColumnTaskTagLibTests.groovy

.../unit/scrumboard/MovableColumnUserStoryTagLibTests.groovy

test/unit/scrumboard/NoteTaskTagLibTests.groovy