2014/08/30/17:36
2014/09/01/14:56
release-2.1.0 - 2014.09.01.15.49.22

Merge remote-tracking branch 'original/release-2.1.0.1' into
release-2.1.0

Conflicts:
	Skein/src/main/webapp/WEB-INF/views/index/index-logged.jsp