added code for https option
fixed apache dependency
added dependency
addition of timeout for threshold configuration
added fix for apache enabled default page on ubuntu
fixed: more flexible parameter for collectd hostname
fixed thresholds.conf: moved metadata to collectd_plugins
fixed: definition parameters check made work on ubuntu precise
fixed network-plugin configuration for server being monitored (client) itself
Merge branch 'https'

Conflicts:
	metadata.rb
Merge branch 'threshold_addition'