added library for laying out the content of the client - this allows user to resize certain parts of the ui
Merge branch 'alpha' of github.com:thehogfather/pvsio-web into alpha

# By Paolo Masci
# Via Paolo Masci
* 'alpha' of github.com:thehogfather/pvsio-web:
  patch for bug #107 (broken open/save files in Emulink)
  patch for bug #106 (save projects issue)
  patch for issue #105 (file list not refreshed when creating empty projects). The problem was due to a mistyped variable name in function ProjectManager.createProject (filePath --> fileName)
  bugfix for Firefox -- does not like img tags with missing src field
  patch for Firefox not resizing blank image to the correct size
  patch for bug #103 (pvs files not loaded in new projects) + users can now choose to overwrite existing projects
  patch for bug #102 (image not refreshed) + updated blank form so that image start.png is not required anymore

Conflicts:
	src/client/app/plugins/prototypebuilder/forms/maincontent.handlebars
fix bugs in running test cases
 	When plugin initialisation and unloading call async functions, they should return Promise objects
	moved defaultProject creation from PrototypeBuilder to main to enable correct and strict order for creation of html elements and projects
minor fix to #body css
Merge remote-tracking branch 'origin/beta' into alpha
patch for allowing tex extension in files tree view list
Merge branch 'alpha' of github.com:thehogfather/pvsio-web into alpha

# By Paolo Masci
# Via Paolo Masci
* 'alpha' of github.com:thehogfather/pvsio-web:
  patch for bugs #109 (issues with zooming) and #110 (issues with adding new states)
Merge commit 'e78029e344efa702f989dd3f7237fa3720e6f3cc' into alpha

* commit 'e78029e344efa702f989dd3f7237fa3720e6f3cc':
  [Emulink] Added a basic PIM Printer
  Update serverFunctions.js
fixed issue where non pvs files were not added to the tree list when added to the project
updated server to return more info when listing project files
added thumbnails to open project dialog box
updated test cases to work with new openProject dialog box
addresses issue #101 changed click/press-release option on buttons to radio buttons
Merge branch 'alpha' into beta

* alpha:
  addresses issue #101 changed click/press-release option on buttons to radio buttons
  updated server to return more info when listing project files added thumbnails to open project dialog box updated test cases to work with new openProject dialog box
  fixed issue where non pvs files were not added to the tree list when added to the project
  patch for allowing tex extension in files tree view list
  minor fix to #body css
  fix bugs in running test cases  	When plugin initialisation and unloading call async functions, they should return Promise objects 	moved defaultProject creation from PrototypeBuilder to main to enable correct and strict order for creation of html elements and projects
  added library for laying out the content of the client - this allows user to resize certain parts of the ui
Merge branch 'beta' of github.com:thehogfather/pvsio-web into beta

# By Paolo Masci
# Via Paolo Masci
* 'beta' of github.com:thehogfather/pvsio-web:
  [Emulink] patch for rendering issue with transitions (transitions were not highlighted when mouse was over transitions)
  [Emulink] minor changes to improve rendering of edges in the diagram
  [Emulink] patch for PIM parser (was erroneously omitting the first transition) + improved rendering of transitions in the diagram
  [Emulink] patch for MUZ parser (added support for state names that include underscores and numbers) + patch for canvas translations
  [Emulink] added basic Cpp printer
  [Emulink] added support for canvas translation
  [Emulink] added support for .muz file format (PIM models can now be loaded in the editor)
  [Emulink] code cleanup
  [Emulink] improved rendering of transitions
  Update README.md
  Update README.md
  [Emulink] Improved rendering of self-transitions (introduced additional control points to make the edge less pointy) + bugfix for PVS printer (missing comma in the initial state caused typecheck error)
  [Emulink] bugfix for codegeneration (runtime error due to undefined variable)
  [Emulink] Improved rendering of edges/transitions (added control points to change the shape of edges/transitions in the diagram)
Merge remote-tracking branch 'origin/beta'