only trends modified
original file
modify : back to original external file
deletion: deletion unused file
fix : update to be compliant with current version of develop
add: more columns in perfdata view
add: default rule gui
add: default rule handling on event_filter engine
added dependency for ldap
fix: Use HTTPS instead of HTTP to access Github
tweak: add documentation and reduce log info
Merge branch 'white-black-list_default-rule' into develop
simple mode ack feature implemented, and small commented code cleans
Merge branch 'update_trend' of git://github.com/micka59/canopsis into micka59-update_trend

Conflicts:
	sources/webcore/var/www/canopsis/app/lib/view/csparkline.js
	sources/webcore/var/www/canopsis/widgets/diagram/diagram.js
	sources/webcore/var/www/canopsis/widgets/mini_chart/mini_chart.css
	sources/webcore/var/www/canopsis/widgets/mini_chart/mini_chart.js
	sources/webcore/var/www/canopsis/widgets/mini_chart/widget.json
	sources/webcore/var/www/canopsis/widgets/trends/widget.json
Merge branch 'develop' into engines-conf