14/09/01  17:13:40  첫 페이지
2014/09/01/17:47
Merge remote-tracking branch 'original/release-2.1.0.2' into release-2.1.0
release-2.1.0 - 2014.09.01.18.06.12

Merge remote-tracking branch 'original/release-2.1.0-첫화면수정' into
release-2.1.0

Conflicts:
	Skein/src/main/webapp/WEB-INF/views/index/comm/layout.jsp
	Skein/src/main/webapp/resources/css/index-not-logged.css
	Skein/src/main/webapp/resources/css/profile/profileView.css
	Skein/src/main/webapp/resources/js/index-logged.js
	Skein/src/main/webapp/resources/js/index-not-logged.js
	Skein/src/main/webapp/resources/js/map.js