[IMPROVEMENT] xaml styles for toolbar and toolbarleap buttons
[MERGE] fix conflicts
[IMPROVEMENT][CLOSES #40] all images in one resource file
Merge branch 'master' of https://github.com/PLICMTI2014-IHM/collaborative_motion
[BUGFIX] change solution version