update to overload removeFile function in project manager to take a string or ProjectFile object
Added filesystem watcher to server
Merge remote-tracking branch 'origin/master' into alpha

Conflicts:
	src/client/app/plugins/emulink/Emulink.js
Merge branch 'master' into alpha

* master:
  [Emulink] implemented new parser for Emucharts (the parser is automatically generated from a grammar using the Jison tool) + minor bugfixes
  [Emulink] added APIs for removing/editing constants and state variables (see enhancement request #154)
  additional fix for bug #141 (svg size not updated)
  additional edits for removing function Save All Files; function Save Selected File is now always enabled (useful for handling situations where a file is edited using an external editor and the user wants to re-save the file shown in the model editor)
  removed button Save All Files, because users may get confused about the difference wrt Save Project
  fix for issue #144 (merge from alpha and beta)

Conflicts:
	src/client/app/plugins/emulink/Emulink.js
Merge branch 'alpha' of github.com:thehogfather/pvsio-web into alpha

# Via Paolo Masci
* 'alpha' of github.com:thehogfather/pvsio-web:

Conflicts:
	src/client/app/plugins/emulink/Emulink.js
improved feedback for the Model Editor when the pvs model fails to typecheck
fix for issue # 158 (merge from master)
add folder watching to opened or created projects
[Emulink] introduced mouse overlay to enhance visibility of modes for the diagram editor (merging code from master)
[Emulink] fixed issue with mouseoverlay (mouse icon erroneously translated when zooming chart (merge from master)
Updated filesystem watcher on server side to keep filetree view and list of files in project up to date.
Addresses #156

Merge branch 'alpha' of github.com:thehogfather/pvsio-web into alpha

# By Paolo Masci
# Via Paolo Masci
* 'alpha' of github.com:thehogfather/pvsio-web:
  fix for issue # 158 (merge from master)
  improved feedback for the Model Editor when the pvs model fails to typecheck
Fixed issue with duplicate file item views

Merge branch 'alpha' of github.com:thehogfather/pvsio-web into alpha

# By Paolo Masci
# Via Paolo Masci
* 'alpha' of github.com:thehogfather/pvsio-web:
  [Emulink] fixed issue with mouseoverlay (mouse icon erroneously translated when zooming chart (merge from master)
  [Emulink] introduced mouse overlay to enhance visibility of modes for the diagram editor (merging code from master)
update to throw error if attempt is made to add a file that already exists in the project
changes to Emulink.js to replace the use of saveFile with addFile
bug fix for multiple addition attemts to project files after files are written to disk
Fixed issue with renaming list items in the tree view
Merge Emulink changes from master
Merge commit '98e42e4d4cbd6684ad05c94dcae28e7bf029cfe2' into alpha

* commit '98e42e4d4cbd6684ad05c94dcae28e7bf029cfe2':
  fix for issue #161
  improved production rules for PVS parser library (fix for issue #160) + additional feedback for parser errors
  [Emulink] added separation offset between transition arrows and transition labels; enabled selection of initial transition when mouse over initial node; improved calculation of box width when renaming nodes (see improvement requests #159)
  [Emulink] fixed issue with mouseoverlay (mouse icon erroneously translated when zooming chart)
  [Emulink] introduced mouse overlay to enhance visibility of modes for the diagram editor
  fix for issue #158
  improved feedback for Model Editor when the pvs file fails to typecheck [ merge from alpha, see commit https://github.com/thehogfather/pvsio-web/commit/0b890e6794046b38f832ee0b43355776447dcc83 ]

Conflicts:
	src/client/app/plugins/emulink/EmuchartsPVSPrinter.js
	src/client/app/plugins/emulink/Emulink.js
Merge branch 'alpha' into master

* alpha:
  Fixed issue with renaming list items in the tree view
  bug fix for multiple addition attemts to project files after files are written to disk
  changes to Emulink.js to replace the use of saveFile with addFile
  update to throw error if attempt is made to add a file that already exists in the project
  [Emulink] fixed issue with mouseoverlay (mouse icon erroneously translated when zooming chart (merge from master)
  [Emulink] introduced mouse overlay to enhance visibility of modes for the diagram editor (merging code from master)
  add folder watching to opened or created projects
  fix for issue # 158 (merge from master)
  improved feedback for the Model Editor when the pvs model fails to typecheck
  Added filesystem watcher to server
  update to overload removeFile function in project manager to take a string or ProjectFile object