20140820 14:19
20140820 16:47
release-1.0.2 - 2014.08.20.17.00.12

Merge remote-tracking branch 'original/account-search' into
release-1.1.0

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