renamed fields, handling error (in an ugly way) when user aborts google login
Merge branch 'app' of github.com:pakohan/de.htwg.seapal.play into app