Edit space wranglers' info
Merge branch 'develop'