jupi-config is now stored on the webserver as config.inc.php
Merge branch 'master' into jupis

Conflicts:
	config.jupis.inc.php