intefaces reestructuradas
editando las interfaces de los activity
Merge branch 'master' of https://github.com/bqreaders/chat-kata-extended

Conflicts:
	client/SimpleChat/AndroidManifest.xml
	client/SimpleChat/res/layout/activity_login.xml
	client/SimpleChat/src/org/ejmc/android/simplechat/configuration/DefaultValues.java
Cambiados MKeys en chatPrivateActivity

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

Conflicts:
	client/SimpleChat/src/org/ejmc/android/simplechat/ChatActivity.java
	client/SimpleChat/src/org/ejmc/android/simplechat/LoginActivity.java
	client/SimpleChat/src/org/ejmc/android/simplechat/UsersActivity.java