Cambios en el cliente.
Merge branch 'master' of https://github.com/bqreaders/chat-kata-extended

Conflicts:
	client/SimpleChat/src/org/ejmc/android/simplechat/LoginActivity.java
Merge branch 'master' of https://github.com/bqreaders/chat-kata-extended

Conflicts:
	server/grails-app/controllers/chat/kata/LoginController.groovy
Cambios en la interfaz: inicio directo con facebook login
Merge branch 'master' of https://github.com/bqreaders/chat-kata-extended