notebook commit
merge
Merge branch 'master' of github.com:Minseung/BabyStory-android

Conflicts:
	.factorypath
	project.properties
	src/com/BabyStory/adapter/RoomItemView.java
	src/com/BabyStory/model/RoomContainer.java