update sign in page
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebRoot/WEB-INF/resources/templates/signIn.ftl