Merge pull request #224 from tomvantilburg/master

merge from Tom
Merge pull request #22 from Geodan/master

pull request 20140328
zoom map to incident location after selection
Merge pull request #225 from MartijnHeuff/master

zoom map to incident location after selection
Merge pull request #55 from Geodan/master

merge from origin