Merge pull request #75 from leider/master

Layouting work and More Tests in client
first redirect, then authenticate
regex was still wrong
removed redirect from secureByLogin
merge
Merge remote-tracking branch 'upstream/master'