Fix typo
Delete SSL Config Pyro4
Merge branch 'master' of https://github.com/naparuba/shinken
Fix : test_livestatus_trigger.py
Remove useless pdb
Merge branch 'master' into sydel

Conflicts:
	etc/packs/os/linux/linux.pack