some css work
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/sign_as_html.erb