Merge from Tibor main branch.
Some GCM updates from Tibor main branch. QR login.
Fixes #99
Merge branch 'master' of git://github.com/MiquelSanahuja/mTor

Conflicts:
	pom.xml
	src/main/java/nl/bhit/mtor/server/timer/AlertSender.java
	src/main/webapp/WEB-INF/security.xml