Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-19 dfe337e04cbc50fed4df23763e67103d6778764e

 interface/web/help/index.php

@@ -10,8 +10,7 @@
  <p>&nbsp;</p>
  <p>&nbsp;</p>
  <p>&nbsp;</p>
  <p>&nbsp;
            </p>
  <p>&nbsp;</p>
</div>
</BODY>
</HTML>
</HTML>