Merge branch 'master' into 'master'

Marius Cramer

2014-01-27 e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c

 interface/web/themes/default/templates/error.tpl.htm

@@ -1,8 +1,8 @@
<div class="uniForm">
  <div id="errorMsg">
    <h3>Error</h3>
      <ol>
        <li>###ERRORMSG###</li>
      </ol>
  </div>
    <div id="errorMsg">
        <h3>Error</h3>
        <ol>
            <li>###ERRORMSG###</li>
        </ol>
    </div>
</div>