server connection
Merge branch 'server2' of https://github.com/egetzner/appagainsthumanity into server2

Conflicts:
	appagainsthumanity/src/at/tugraz/iicm/ma/appagainsthumanity/MainActivity.java
adding gcmid to db working