reorganisation
Setting amelioré
ajout json
Merge branch 'Interface' of https://github.com/Ricain/stcal into Interface

Conflicts:
	com/stcal/control/json