Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-14 80c6a7f559ceb100b82921019bab3a0c5ed2ae2a

 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>