Merge pull request #13 from Geodan/master

pull request 20140318
Merge pull request #14 from Geodan/master

pull request 20140320
Login and Logout
Merge pull request #159 from MartijnHeuff/master

Login and Logout