Merge pull request #220 from tomvantilburg/master

merge from Tom
Update README.md
Merge pull request #21 from Geodan/master

pull request 20140327
Merge pull request #221 from tomvantilburg/master

Forced use of JSONP for esri-leaflet
#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
Merge pull request #54 from Geodan/master

merge from origin