Merge branch 'nagios-implementation' of git.ispconfig.org:darkalex/ispconfig3...

Merge branch 'nagios-implementation' of git.ispconfig.org:darkalex/ispconfig3 into nagios-implementation

Conflicts:
	interface/web/monitor/show_nagios.php
	interface/web/monitor/templates/show_nagios.htm