new config system
Merge branch 'master' of github.com:apollo-ng/PiGI

Conflicts:
	software/pigid/public/assets/js/webGI.js