Merge branch 'choose-skills-and-interests'

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