restructuring of formulas directives.
adapting rules editor.
Merge branch 'db-7' of https://github.com/28msec/secxbrl.info into db-7
Merge branch 'master' of https://github.com/28msec/secxbrl.info into db-7

Conflicts:
	queries/public/test/secxbrl/components.jq
	tasks/28.js
Merge branch 'db-7' of https://github.com/28msec/secxbrl.info into db-7

Conflicts:
	tasks/28.js