Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-10-13 43418672d32ee65ee6060314d4e66c3c44a8b0cb

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

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





?>
<?php


?>