update room story, setting(picker&notification).
Merge branch 's81375' of https://github.com/din1030/helloEarthman

* 's81375' of https://github.com/din1030/helloEarthman:
  update room story, setting(picker&notification).
Merge commit '0883f3a9ad8a45e68616e5c6200d19d75c4b3fde' into din1030

Conflicts:
	wakeup.xcodeproj/project.pbxproj