2014/08/23/14:45
2014/08/23/15:10
2014/08/23/15:19
release-1.1.0 - 2014.08.23.15.28.32

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

Conflicts:
	Skein/src/main/webapp/WEB-INF/views/comm/layout.jsp
	Skein/src/main/webapp/WEB-INF/views/friendship/viewlist.jsp
	Skein/src/main/webapp/WEB-INF/views/index/comm/layout.jsp
	Skein/src/main/webapp/WEB-INF/views/photo/viewlist.jsp
	Skein/src/main/webapp/resources/js/friendship.js