08/18/17:34
release-1.0.2 - 2014.08.18.17.55.34
Merge remote-tracking branch 'original/release-1.0.2.2' into
release-1.0.2

Conflicts:
	Skein/src/main/webapp/WEB-INF/views/index/index-logged.jsp
	Skein/src/main/webapp/resources/css/common.css
	Skein/src/main/webapp/resources/js/index.js