Merge branch 'master' into eue
Merge branch 'eue' of https://github.com/naparuba/shinken into eue
Merge branch 'eue' of https://github.com/naparuba/shinken into eue
Fix missing browser icon for phantomjs
Fix serious problems with phantomjs