Merge branch 'master' into 'master'

Marius Cramer

2014-03-06 35b30fa77ef939f85b6d31446e8710e8f03486b6

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

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





?>
<?php


?>