merging
Merge branch 'master' of https://github.com/BlueprintDevTeam/paritaire

Conflicts:
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	play.html
	static/css/style.css
Preparation for status bar