Merge remote-tracking branch 'origin/master'

Conflicts:
	AddressBookApp/res/layout/activity_main.xml
	AddressBookApp/src/com/AddressBook/MainActivity.java
누락된 파일 업로드