메인엑티비티 약간 수정함.
뭔가 좀이상하다
되라 제발
WTF
Merge branch 'master' of
https://github.com/TermProjectTeam/AddressBookAndroid.git

Conflicts:
	AddressBookApp/src/com/AddressBook/MainActivity.java
editActivity Field부분 수정
Edit field 부분 삭제버튼 구현중..
MainActivity 거의 완성. FileManager 수정 완료.
Merge remote-tracking branch 'origin/master'

Conflicts:
	AddressBookApp/res/layout/activity_main.xml
	AddressBookApp/src/com/AddressBook/MainActivity.java
누락된 파일 업로드
Merge branch 'master' of
https://github.com/TermProjectTeam/AddressBookAndroid.git

Conflicts:
	AddressBookApp/res/layout/activity_edit.xml
	AddressBookApp/res/layout/activity_main.xml
	AddressBookApp/src/com/AddressBook/EditActivity.java
	AddressBookApp/src/com/AddressBook/MainActivity.java