Add: now the shinken cli command can also merge the test directory
Merge branch 'master' of github.com:naparuba/shinken