refactor step definitions to use Capybara find and add step to close modal
merge with upstream develop
pull marcelo's branch
merge problems
resolve conflict with yt_link between scrums.js and users.js
refactor specs so tests pass
implemented code w/sampriti to close modal/video plus audio