Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 0b2c4118a0894f722318ae4d861baddb8f66fd4d

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

@@ -67,7 +67,7 @@
          <!-- content -->
          <div id='content' class='right'>
         <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class='form-horizontal' role='form'>
            <div id="pageContent"><!-- AJAX CONTENT --></div>
            <div id="pageContent" data-startpage="{tmpl_var name="startpage"}"><!-- AJAX CONTENT --></div>
         </form>
          </div>
          <!-- news sidebar -->