old TODO updated, \todo added and signed
Merge branch 'dev' of https://github.com/nicolashincker/i-score into dev
Merge branch 'dev' of https://github.com/nicolashincker/i-score into dev

Conflicts:
	i-score.xcodeproj/project.pbxproj
Merge branch 'dev' of https://github.com/nicolashincker/i-score into dev

Conflicts:
	src/data/Maquette.cpp
Merge branch 'dev' of https://github.com/nicolashincker/i-score into dev

Conflicts:
	i-score.xcodeproj/project.pbxproj
Merge branch 'dev' of https://github.com/nicolashincker/i-score into dev
Revert a xcode file to abort conflict during merge
NetworkTree : nodes type message editable (but not selectable)
better buttons

Conflicts:
	images/boxEndMenu.svg
	images/boxStartMenu.svg
fixing the buttons (bad merge)
new buttons

in real svg
Maybe be bad but it works
box duration shown in maquetteScene statusBar (bottom) - test triggerPoints ok
Updating conditionnal feature
box duration shown in maquetteScene statusBar (bottom) - test triggerPoints ok

Conflicts:
	compileWithLibraries.sh
box duration shown in maquetteScene statusBar (bottom) - test triggerPoints ok

Conflicts:
	compileWithLibraries.sh
Rigid relation hover : Displays the relation's duration
Box duration shown in the box (not with a toolTip)
Merge branch 'score' of https://github.com/nicolashincker/i-score into score

Conflicts:
	qrc_i-score.cpp
Merge branch 'dev' of https://github.com/nicolashincker/i-score into score