Fix merge conflicts
Be sure taht zabbix_agent is start and enable
add a service_state attribute
Default values can/must be in attribute file
Merge branch 'upstream' into cleanup_lwrps
Merge pull request #81 from Youscribe/attribute_web

Simple fix in web recipe
Merge pull request #82 from RiotGames/graph_items_from_hosts

Graph items from hosts
Merge pull request #83 from RiotGames/remove_mysql_devel

Remove mysql-devel package
Merge pull request #84 from RiotGames/java_gateway

Java gateway configuration
Merge pull request #85 from RiotGames/host_macros

Allow defining of host macros
Merge pull request #78 from Youscribe/service_start

Be sure that zabbix_agent is start and enable
you cant update macros through host.update in 2.0 api
Merge branch 'host_macros' into integration
fix merge conflicts
Merge branch 'cleanup_lwrps' into integration

Conflicts:
	providers/graph.rb