Faz Login e Registo com o facebook
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/model/Features.java