Fixing Regex Tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChatManager.iml
Fixing Regex Tests