release-1.1.0 - 2014.08.26.20.33.32
release-1.1.0 - 2014.08.26.20.42.32

Merge remote-tracking branch 'original/release-1.2.4' into release-1.1.0

Conflicts:
	Skein/src/main/java/kr/co/skein/model/mapper/replyDao.xml
Merge branch 'release-1.1.0' of https://github.com/kosta75/Skein.git
into release-1.1.0