Merge pull request #90 from tomvantilburg/master

merge from Tom
klik class
klik class
klik class
klik class
Merge pull request #91 from stvno/master

klik class
Merge pull request #12 from Geodan/master

pull request 20140314
redirect to login
Merge pull request #92 from MartijnHeuff/master

redirect to login
required to select a user
Merge pull request #93 from MartijnHeuff/master

required to select a user
Merge pull request #34 from Geodan/master

merge from origin