sync RMF to cbdffd490fd9f613920318b3ae53169cdc0e3f7c

git-svn-id: https://svn.salilab.org/imp/trunk@16052 e91f8c7b-0e32-4433-a9ac-4502d39a4eab
Merge branch 'develop' of github.com:salilab/imp into develop
nightly update
nightly branch update