nothing
Merge branch 'interface' into stateEngine
State managing modification
other modification for state managing
Merge commit 'b3727388f0a6ad1d06b4d906eebbfba8ab300b3e' into PDP
moification of state managing
small state bug modification
"select" and "move" states are managed with Event/State. When we create views, "select" is called by default. bug correction.
Integration of the new lasso within nvd3 view.
Preparing for synchronization of selections
Merge commit '2d33f447134ec2da61fc8f03713692152cc960c5' into PDP
Merge commit '2ad894049c0eaf37185d7a02a2e1f6a58e1bb57d' into PDP

Conflicts:
	client/Controller.js
	client/Interface.js
	client/ViewGraph.js
	client/ViewGraphCatalyst.js
	client/ViewGraphSubstrate.js
	client/context.js
Early implementation of the new lasso in nvd3 scatterplot view,
quickly linked through the substrate view in order to sync to catalyst
Merge branch 'PDP' into interface

Conflicts:
	client/Interface.js