Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2014-11-27 b553b2bf146cf20bd3ddfeba52ec5cc5b70a1da9

 interface/lib/config.inc.php

@@ -44,7 +44,7 @@

//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.5.4dev');
define('ISPC_APP_VERSION', '3.1dev');
define('DEVSYSTEM', 0);