20140820 20:40 정보페이지 ㅜㅜ낼이어서할게욥
20140821 21:25 info_page 디자인..ㅎ
release-1.1.0 - 2014.08.22.10.59.32

Merge remote-tracking branch 'original/release-1.1.0.2-info' into
release-1.1.0

Conflicts:
	Skein/.settings/org.eclipse.core.resources.prefs
	Skein/src/main/webapp/WEB-INF/views/account/resources/resources.jsp
	Skein/src/main/webapp/WEB-INF/views/profile/resources/resources.jsp
	Skein/src/main/webapp/WEB-INF/views/profile/view.jsp