fixed bug with regex for strings

strings returned by pvsio have double quotes, so the expression \w is not capturing the string. I have also added spaces (\s) and points (.)
fixed bug in DisplayManager -- does not correctly handle strings

Function eval() is now invoked only with numbers (and not with strings). For strings, double quotes are removed from the regex.
Merge branch 'master' into dev-imagemaps

Conflicts:
	public/pvsioweb/app/formal/pvs/prototypebuilder/displayManager.js
	public/pvsioweb/app/formal/pvs/prototypebuilder/displayMappings.js