working on regex
Merge branch 'master' of github.com:gibiansky/adventurer

Conflicts:
	static/AdvEditor/scripts/mynew_highlight_rules.js