Merge diff
Merge branch 'master' of github.com:/sugarsweetrobotics/wasanbon

Conflicts:
	wasanbon/core/rtm/install_rtm.py
Merged