* Assigning a service to a cluster host no longer requires a reinventory
* Setting a check_type or service to ignore no longer requires a reinventory
        Note: If the ignore rule is removed the services will reappear
* Config creation: The ignore services rule now also applies to custom, active
                   and legacy checks

* Fix: Inventory screen: Now shows custom checks
* Inventory screen: Host inventory also displays its clustered services
* Rules: Renamed "Ignored services" to "Disabled services"
         Renamed "Ignored checks" to "Disabled checks"
* Assigning a service to a cluster host no longer requires a reinventory
* Setting a check_type or service to ignore no longer requires a reinventory
        Note: If the ignore rule is removed the services will reappear
* Config creation: The ignore services rule now also applies to custom, active
                   and legacy checks

* Fix: Inventory screen: Now shows custom checks
* Inventory screen: Host inventory also displays its clustered services
* Rules: Renamed "Ignored services" to "Disabled services"
         Renamed "Ignored checks" to "Disabled checks"
Merge branch 'master' of ssh://mathias-kettner.de/check_mk

Conflicts:
	web/htdocs/wato.py