14/08/26 15:23:56 공유하기
release-1.1.0 - 2014.08.26.15.47.21

Merge remote-tracking branch 'original/release-1.1.0-광효' into
release-1.1.0

Conflicts:
	Skein/src/main/java/kr/co/skein/controller/BoardController.java
	Skein/src/main/java/kr/co/skein/model/mapper/ProfileDao.xml
	Skein/src/main/webapp/WEB-INF/views/comm/aside-logged.jsp
	Skein/src/main/webapp/WEB-INF/views/comm/header.jsp
	Skein/src/main/webapp/WEB-INF/views/index/index-logged.jsp
	Skein/src/main/webapp/WEB-INF/views/index/more/more-mainBoard.jsp
	Skein/src/main/webapp/resources/js/index-logged.js