Merge pull request #21 from Geodan/master

pull request 20140327
#188 show count active users for incident
IE layout issue of logout page
Merge pull request #222 from MartijnHeuff/master

#188 show count active users for incident