Saan kätte google Authentication tokeni. Various other tidbits fixed as
well.
Merge branch 'master' of https://github.com/jaantti/Omega.git

Conflicts:
	server/war/WEB-INF/classes/com/appspot/omega/HaaledErakond.class
Merge branch 'master' of https://github.com/jaantti/Omega.git