Merge pull request #911 from 5c077yP/merge_service_contacts_with_host_contacts

Merge service contacts with host contacts
Revert "added explicit config to merge contacts from host to service"

This reverts commit bbcdeb74007aff48e5a312ebc40bdb28c6732156.
Revert "forgot changes in item.py"

This reverts commit 67cba6eca02dfb9b466d5ea3f2a6a442c7a955bc.
Revert "merge service contacts with host contacts"

This reverts commit d93e4b23230e238bc727022ab79b3340b2078345.
adding two more test cases for timeperiods
time typo
Merge branch 'branch-1.4' of https://github.com/naparuba/shinken into branch-1.4
solving the timeperiod testcases now
Fix: conflicts