Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-07-05 3cc04cc5219bfd72d83b58d2f6ae83092e0c9fb6

 install/tpl/config.inc.php.master

@@ -56,7 +56,7 @@

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