before edit
Merge remote-tracking branch 'origin/resultPage' into get

Conflicts:
	MyPI Android/AndroidManifest.xml
	MyPI Android/res/values/strings.xml
	MyPI Android/src/kr/hansung/mypi/ResultActivity.java