2014/08/26/15:06
release-1.1.0 - 2014.08.26.15.15.23

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

Conflicts:
	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/css/index-logged.css