2014/08/21/21:05
2014/08/21/21:22
140802 15:20  현덕이+ 친구페이지
release-1.1.0 - 2014.08.22.15.24.32

Merge remote-tracking branch 'original/release-1.1.9' into release-1.1.0

Conflicts:
	Skein/.settings/org.eclipse.core.resources.prefs
	Skein/src/main/java/kr/co/skein/controller/FriendshipController.java
	Skein/src/main/webapp/WEB-INF/views/index/index-logged.jsp
	Skein/src/main/webapp/resources/css/index-logged.css