2014/08/21/11:15
2014/08/21/11:15
Merge remote-tracking branch 'original/release1.1.0.test' into
release-1.1.0

Conflicts:
	Skein/.settings/org.eclipse.core.resources.prefs
	Skein/src/main/java/kr/co/skein/controller/IndexController.java
	Skein/src/main/java/kr/co/skein/model/mapper/BoardDao.xml
	Skein/src/main/webapp/WEB-INF/views/index/index-logged.jsp
	Skein/src/main/webapp/WEB-INF/views/index/resources/resources.jsp
release-1.1.0 - 2014.08.21.13.37.32