Merge pull request #1312 from RosettaCommons/hahnbeom/normalmode_update2 Fixing issues with extra_res in NormalMode