Some changes made to RegExprParser
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules/scalascript.iml
Some changes made to RegExprParser