Merge branch 'develop' into alpha
Merge branch 'develop' into alpha
update version number and assembly distribution name
Merge branch 'develop' into alpha
update to 2.6.0
now install by default in the distrib name folder
add a special iss file for alpha : because we need another appId than std
Merge branch 'develop' into alpha
upgrade alpha to 2.6.1
Merge branch 'develop' into alpha
Merge branch 'develop' into alpha
Merge branch 'develop' into alpha

Conflicts:
	Setup/StandardSetup/BuildInfo.ini
	Setup/StandardSetup/FrenchUpdateScript - Classique.iss
A small translation
Merge branch 'alpha' into develop
Editor translations (i hope for the last time)
Editor  topmost + InputTrigger doesn't swallow mouse event anymore
BasicScroll : displaying the trigger key's name
KeyboardEditor : we can now change W & H on the main edition panel
The Context is now in french (zones)
Translations (BasicScroll & KeyboardEditor)