Merge branch 'mechanical-dev'
Merge branch 'master' of https://github.com/maslab-team/maslab-2014-team17