Api Facebook - Cambiada
Merge branch 'master' of https://github.com/QuintoSA/Android.git

Conflicts:
	Apeaime/res/values/strings.xml
	Apeaime/src/edu/uci/quinto/apeaime/LoginActivity.java
	Apeaime/src/edu/uci/quinto/apeaime/LoginEmailActivity.java
	Apeaime/src/edu/uci/quinto/apeaime/RegistroUsuarioActivity.java