changes to test.'s and events in config
Merge branch 'master' into dev

Conflicts:
	dripoint/js/config-local.js
	dripoint/js/et-test.js