2014.08.19/18:09
release-1.0.2-2014.08.19.18.15.23

Merge remote-tracking branch 'original/release-1.0.3' into release-1.0.2

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