Merge commit '3978ca6b5b274108752f3b9945f7dc185a7912b2' into android_1_client_development

Conflicts:
	android-client-1/res/values-pl/strings.xml
	android-client-1/src/com/blstream/ctf1/asynchronous/CreateGame.java
	android-client-1/src/com/blstream/ctf1/asynchronous/DeleteGame.java
	android-client-1/src/com/blstream/ctf1/asynchronous/EditGame.java
	android-client-1/src/com/blstream/ctf1/asynchronous/EditGameDetails.java
	android-client-1/src/com/blstream/ctf1/asynchronous/GameDetails.java
	android-client-1/src/com/blstream/ctf1/asynchronous/JoinGame.java
	android-client-1/src/com/blstream/ctf1/asynchronous/LeaveGame.java
	android-client-1/src/com/blstream/ctf1/asynchronous/Login.java
	android-client-1/src/com/blstream/ctf1/asynchronous/RefreshPlayersList.java
resolved
Merge branch 'android_1_client_development' of https://github.com/blstream/CaptureTheFlag into android_1_client_development

Conflicts:
	android-client-1/res/values-pl/strings.xml
	android-client-1/src/com/blstream/ctf1/asynchronous/DeleteGame.java
	android-client-1/src/com/blstream/ctf1/asynchronous/EditGame.java
	android-client-1/src/com/blstream/ctf1/asynchronous/GameDetails.java
	android-client-1/src/com/blstream/ctf1/asynchronous/Login.java
	android-client-1/src/com/blstream/ctf1/asynchronous/RefreshPlayersList.java