Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-12 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29

 interface/web/sites/form/database_user.tform.php

@@ -116,6 +116,14 @@
         'width'  => '30',
         'maxlength' => '255'
      ),
      'database_password_mongo' => array (
         'datatype' => 'VARCHAR',
         'formtype' => 'PASSWORD',
         'default' => '',
         'value'  => '',
         'width'  => '30',
         'maxlength' => '255'
      ),
      //#################################
      // ENDE Datatable fields
      //#################################