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
perf should return None 

as it can be mistaken later for metric value, which can be also 1.
or is there another way to determine which 1 it'is False or just 1?
Moved business rules output processing a level up.

Processing was bound to Service class, but hosts may also have business
rules defined as check_command. So all business output processing
methods have been moved into the parent SchedulingItem class.
Added percentage support to Xof: business rules.
Merge pull request #970 from geektophe/pb_rule_output_fix

FIX: Added business rules output (#962).
Merge pull request #971 from geektophe/bp_rule_xof_pct

Added percentage support to Xof: business rules.
Merge pull request #960 from andrus7k/patch-1

perf should return None
Fix: conflicts