012 017 contents

012 017 contents
Merge branch 'content_031'

Conflicts:
	BrainHealth/BrainHealth.xcodeproj/project.pbxproj
	BrainHealth/BrainHealth/RootViewController.m
	BrainHealth/BrainHealth/vc_contents/Common/ContentInfo.m
	BrainHealth/BrainHealth/vc_contents/Content_026/PairComposition.h
	BrainHealth/BrainHealth/vc_contents/Content_026/PairComposition.m