Merge branch 'master' of https://github.com/28msec/secxbrl.info into all-dow30-6

Conflicts:
	config.json.enc
Merge branch 'all-dow30-6' of https://github.com/28msec/secxbrl.info into reenable-advanced-rules

Conflicts:
	config.json.enc