Make main.js code more generic, store settings as JSON
Merge branch 'master' of github.com:troxler/signal-collect

Conflicts:
	web-data/main.js
Some layout, better settings handling etc.