updated master, resolved conflicts

A. Täffner

2016-01-22 ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb

 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>