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

Conflicts:
	client/SimpleChat/src/org/ejmc/android/simplechat/net/NetRequests.java
	client/SimpleChat/src/org/ejmc/android/simplechat/net/connection/ApiRestUserAsyncTask.java