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

Conflicts:
	client/SimpleChat/src/org/ejmc/android/simplechat/ChatPrivateActivity.java