Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-29 d30f2c69b1fbfcb9bebe17996d11dc4863afd8bc

 interface/web/login/lib/module.conf.php

@@ -1,6 +1,7 @@
<?php

$module["name"]       = "login";

$module["title"]       = "Login";

$module["template"]    = "module.tpl.htm";

$module["startpage"]    = "login/index.php";

?>
<?php
$module["name"]   = "login";
$module["title"]   = "top_menu_login";
$module["template"]  = "module.tpl.htm";
$module["startpage"]  = "login/index.php";
$module["nav"] = array();
?>