Done with sign in
Done with sign in
Done with sign in
Merge branch 'sign-in-out'

Conflicts:
	webrat.log