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

Author: A. Täffner

interface/web/monitor/show_nagios.php

@@ -103,4 +103,4 @@
 
 $app->tpl_defaults();
 $app->tpl->pparse();
-?>
+?>