Smartanswers: Marriage abroad, content and logic update

https://www.pivotaltracker.com/story/show/73384816