Merge branch 'master' into choose-skills-and-interests

Conflicts:
	WhatsYourStory/app/src/main/res/values/strings.xml