injectable client
Merge branch 'master' of https://github.com/pawelByszewski/planning_poker

Conflicts:
	android/poker/src/main/java/pl/touk/poker/android/ui/ComponentsActivity.java