Signed-off-by: skullacy <skullacy@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	stufinder/AndroidManifest.xml
	stufinder/bin/AndroidManifest.xml
	stufinder/bin/R.txt
	stufinder/bin/classes.dex
	stufinder/bin/classes/com/example/stufinder/R$drawable.class
	stufinder/bin/classes/com/example/stufinder/R$id.class
	stufinder/bin/classes/com/example/stufinder/R$layout.class
	stufinder/bin/classes/com/example/stufinder/R$menu.class
	stufinder/bin/classes/com/example/stufinder/R$string.class
	stufinder/bin/classes/com/example/stufinder/R$style.class
	stufinder/bin/classes/com/example/stufinder/R$styleable.class
	stufinder/bin/classes/com/example/stufinder/dMap$ServerCommTask.class
	stufinder/bin/classes/com/example/stufinder/dMap.class
	stufinder/bin/classes/com/example/stufinder/sMap$1.class
	stufinder/bin/classes/com/example/stufinder/sMap.class
	stufinder/bin/classes/com/google/android/gms/R$drawable.class
	stufinder/bin/resources.ap_
	stufinder/bin/stufinder.apk
	stufinder/gen/com/example/stufinder/R.java
	stufinder/gen/com/google/android/gms/R.java
	stufinder/project.properties
	stufinder/src/com/example/stufinder/dMap.java
	stufinder/src/com/example/stufinder/sMap.java


Signed-off-by: skullacy <skullacy@gmail.com>


Signed-off-by: skullacy <skullacy@gmail.com>
레이아웃 인플레이트, 콜/SMS 인텐트 연결, DetailActivity

Signed-off-by: skullacy <skullacy@gmail.com>