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

Conflicts:
	MyPI Android/src/kr/hansung/mypi/ResultActivity.java