change branch of motoman
Merge branch 'master' of https://github.com/ipa320/automatica2014