Initial
Initial
Merge branch 'master' of https://github.com/andig/vzmon

Conflicts:
	js/options.js