Missed conflict resolved from merge

Marius Cramer

2014-02-18 030bb96e51a32a7c425bdb29db9716bfbe458922

 interface/web/help/index.php

@@ -13,4 +13,4 @@
  <p>&nbsp;</p>
</div>
</BODY>
</HTML>
</HTML>