ddd
이제 제대로 합쳐진 것 같은데, 이걸로 가죠

Merge remote-tracking branch 'origin/newmaster' into justin

Conflicts:
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/DoneFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/InProgressFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/MainActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/MyWorksFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/ToDoFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/DoneFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/InProgressFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/KanbanActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/MyWorksFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/kanban/ToDoFragment_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/login/LoginActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/login/SignupActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/project/ProjectCreationActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/project/ProjectInvitationActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/project/ProjectSelectionActivity_.java
	Coco-nut/.apt_generated/com/egoists/coco_nut/android/project/ProjectSelectionFragment_.java

뭔가 이것저것 함

[진행] Card Detail 작업중.
Merge branch 'final' into yg

Conflicts:
	Coco-nut/src/com/egoists/coco_nut/android/project/ProjectSelectionActivity.java