디자인용
Merge branch 'master' of https://github.com/Nexters/House.Android.git

Conflicts:
	House/res/values/server.xml