Merge branch 'mergebranch'

Marius Burkard

2016-01-04 cb287d1f1be13beaba7fe84c906dd0683dfb9fb5

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

@@ -3,4 +3,5 @@
$module["title"]   = "top_menu_login";
$module["template"]  = "module.tpl.htm";
$module["startpage"]  = "login/index.php";
$module["nav"] = array();
?>