Merge remote-tracking branch 'origin/master'

# Conflicts:
#	examples/template-html.php

Author: kostant85

examples/template-html.php

@@ -9,6 +9,9 @@
 <p><b>Subject:</b> {subject}</p>
 <p><b>Message:</b><br>
 	{message}</p>
+<hr>
+<p>User IP address: <?php echo @$_SERVER['REMOTE_ADDR']; ?></p>
+<p>Browser: <?php echo @$_SERVER['HTTP_USER_AGENT']; ?></p>
 
 <?php if (count($links) > 0): ?>
     <ul>

examples/template-plain.php

@@ -6,4 +6,9 @@
 Subject: {subject}
 Message:
 
-	{message}
+	{message}
+
+-------
+
+User IP address: <?php echo @$_SERVER['REMOTE_ADDR']; ?>
+Browser: <?php echo @$_SERVER['HTTP_USER_AGENT']; ?>