Merge branch 'master' into master-sqlserver

Conflicts:
	core/templates/installation.php

diff --cc core/templates/installation.php
index a57506ef2378ee16c6b941325f65c8868cd27566,c48d2f764e79592f6e6c2b181f4bf7d906d055f1..aca9648d0bfd81db249ebea698574cb9fbced7d4
--- 1/core/templates/installation.php
--- 2/core/templates/installation.php
+++ b/core/templates/installation.php
@@@ -58,7 -60,8 +61,8 @@@
        </fieldset>
  
        <fieldset id='databaseField'>
-               <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
 -              <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
++              <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
+                       $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
                <legend><?php echo $l->t( 'Configure the database' ); ?></legend>
                <div id="selectDbType">
                <?php if($_['hasSQLite']): ?>
@@@ -99,20 -105,10 +106,21 @@@
                <input type="hidden" id="dbtype" name="dbtype" value="oci" />
                <?php else: ?>
                <label class="oci" for="oci">Oracle</label>
-               <input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
+               <input type="radio" name="dbtype" value='oci' id="oci"
+                       <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
                <?php endif; ?>
                <?php endif; ?>
 +        
 +              <?php if($_['hasMSSQL']): ?>
 +              <input type='hidden' id='hasMSSQL' value='true'/>
 +              <?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL'] and !$_['hasOracle']): ?>
 +              <p>MS SQL <?php echo $l->t( 'will be used' ); ?>.</p>
 +              <input type="hidden" id="dbtype" name="dbtype" value="mssql" />
 +              <?php else: ?>
 +              <label class="mssql" for="mssql">MS SQL</label>
 +              <input type="radio" name="dbtype" value='mssql' id="mssql" <?php OC_Helper::init_radio('dbtype', 'mssql', 'sqlite'); ?>/>
 +              <?php endif; ?>
 +              <?php endif; ?>        
                </div>
  
                <?php if($hasOtherDB): ?>

diff --cc lib/setup.php
Simple merge