EDIT voor Fabian
CHANGED minor changes
Merge pull request #47 from flubbes/Design

merge Design into update-1
CHANGED minor changes
CHANGED minor changes
Merge branch 'update-1' into poker

Conflicts:
	main/AndroidManifest.xml
	main/java/com/gamepad/JoinActivity.java
	main/res/layout/activity_host.xml