enable rule creation from multiple messages
add support for merging new criteria to existing rules
Merge branch 'master' into release-2.0

Conflicts:
	README.md