update regex for form percent helper
run grunt test for screens
Fixed merge conflict.
Merge pull request #374 from optimizely/dfoxpowell/customer-stories-helper

update regex for form percent helper