fade fix
Merge branch 'master' into tiago

Conflicts:
	js/sign-in.js
	sign-in.html
added family page
Merge branch 'master' into tiago
no message
Merge branch 'tiago'

Conflicts:
	css/sign-in.css