Google Cloud Messaging
Merge branch 'master' of https://github.com/wpatrik14/ICTDroidLab.git

Conflicts:
	core/res/values/strings.xml
	core/src/hu/edudroid/ict/ui/MainActivity.java