fixed bug with show_result
GCM compatibility
some trials with php
some trials with gcm, server setup
some more gcm trials
common
gcm registration
added server project files
progress on xmlrpc-communication

added queries to:
- check server connection
- register user at server
- retrieve id of username
- create game at server
progress of last weekend
added message processing up to choosing and sending black card alternatives to user
extracted gamerule handling of server application in designated abstract class structure
streamlined notifications
added handling of dealt white cards
added xmlrpc-config for local, server-related configuration
added asynchronous server queries at main-activity
added server communication up to choosing of a winning card
bigmerge
mergehead
Merge branch 'serverGCM' into server2

Conflicts:
	appagainsthumanity/AndroidManifest.xml
	appagainsthumanity/res/values/strings.xml
	appagainsthumanity/src/at/tugraz/iicm/ma/appagainsthumanity/MainActivity.java
	appagainsthumanity/src/at/tugraz/iicm/ma/appagainsthumanity/connection/ServerProxy.java
	appagainsthumanity/src/at/tugraz/iicm/ma/appagainsthumanity/connection/xmlrpc/XMLRPCServerProxy.java
	serverAgainstHumanity/module/Application/src/Application/Controller/IndexController.php
gcm added, but commented out for now
some more php files for trial
server connection
working version
Merge branch 'server2' of https://github.com/egetzner/appagainsthumanity into server2

Conflicts:
	appagainsthumanity/src/at/tugraz/iicm/ma/appagainsthumanity/MainActivity.java