test-
-
release-2.1.0 - 2014.09.02.08.55.32


Merge remote-tracking branch 'original/release-2.7.0.test' into
release-2.1.0

Conflicts:
	Skein/src/main/java/kr/co/skein/model/dao/NotificationDao.java
	Skein/src/main/java/kr/co/skein/model/mapper/NotificationDao.xml
	Skein/src/main/java/kr/co/skein/model/vo/notification/FriendshipNotification.java
	Skein/src/main/java/kr/co/skein/model/vo/notification/ReplyNotification.java
	Skein/src/main/java/kr/co/skein/model/vo/notification/ShareNotification.java