Merge branch 'master' into 'master'

Marius Cramer

2014-01-27 e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c

 interface/web/designer/lib/admin.conf.php

@@ -1,4 +1,4 @@
<?php





?>
<?php


?>