make v4
Merge branch 'master' of https://github.com/naodroid/storyboardtest

Conflicts:
	StoryboardTest/StoryboardTest/Base.lproj/Main.storyboard