[IMPROVEMENT] OptionsWindow
Merge branch 'master' of https://github.com/PLICMTI2014-IHM/collaborative_motion