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/DetailActivity$ReplyAdapter.class
	stufinder/bin/classes/com/example/stufinder/Dmap.class
	stufinder/bin/classes/com/example/stufinder/DmapFragment.class
	stufinder/bin/classes/com/example/stufinder/DmapFragmentLeftSlide$StuffListAdapter.class
	stufinder/bin/classes/com/example/stufinder/MainActivity.class
	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$integer.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/Reg.class
	stufinder/bin/classes/com/example/stufinder/Smap.class
	stufinder/bin/classes/com/google/maps/android/R$id.class
	stufinder/bin/classes/com/google/maps/android/R$layout.class
	stufinder/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$id.class
	stufinder/bin/dexedLibs/actionbarsherlock-d1a4e9b5a3e43162edfe25f45be515ed.jar
	stufinder/bin/dexedLibs/google-play-services_lib-e21c65d61a7dbefcf0f41b76b24c31ec.jar
	stufinder/bin/dexedLibs/library-fe1266e5e9bddab3daa0265ccaf10da0.jar
	stufinder/bin/dexedLibs/markerutil-42361a504f12b18488def29e3e474a9b.jar
	stufinder/bin/resources.ap_
	stufinder/bin/stufinder.apk
	stufinder/gen/com/example/stufinder/R.java
	stufinder/gen/com/google/maps/android/R.java
	stufinder/gen/com/jeremyfeinstein/slidingmenu/lib/R.java


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