login working, messages still hardcoded, ehm, optimized registration and all that.
Merge remote-tracking branch 'origin/master' into robin
Merge remote-tracking branch 'origin/nils'
Merge branch 'master' into nils

gimme those master updates