Changed parseEntity regex to remove Catastrophic Backtracking#64

Merged

mishal merged 2 commits intomishal:masterfrom bstoney:master

Mar 14, 2016

+65-18

Commits on Mar 9, 2016

Changed parseEntity regex to remove Catastrophic Backtracking this fixes mishal#61
Brad
committed

Commits on Mar 11, 2016

Reverted less test files
Brad
committed