bla bla bla bla bla
Merge branch 'master' into tiago

Conflicts:
	js/sign-in.js
	sign-in.html