14/08/27 17:02:45
14/08/27 18:55:50
2014/08/28/11:48/소룡
release-1.1.0 - 2014.08.28.14.54.52

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/controller/NotificationController.java
	Skein/src/main/java/kr/co/skein/model/dao/BoardDao.java
	Skein/src/main/java/kr/co/skein/model/mapper/BoardDao.xml
	Skein/src/main/java/kr/co/skein/model/vo/NotificationAllCommand.java
	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/WEB-INF/views/notification/notificationView.jsp
	Skein/src/main/webapp/resources/js/common-logged.js
	Skein/src/main/webapp/resources/js/index-logged.js
	Skein/src/main/webapp/resources/js/notification.js