Added: Shinken link
Merge branch 'devel'