facebook 글쓰기/친구목록보기/장소선택 추가
Merge branch 'master' of https://github.com/roydang/AndroidArchetype_v_1_2

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/main/java/m2/android/archetype/example/MainActivity.java
merge