scrums.feature change to modal
merging with develop6514
pull marcelo's branch
merge problems