Merged fork with latest original master

dca54ec7 · Saurabh Belsare · cace5edf · 01f9e415 · dca54ec7 · dca54ec7
Commit dca54ec7 authored Jun 30, 2016 by Saurabh Belsare
20 changed files
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaInPlaneAngleForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaOutOfPlaneBendForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaOutOfPlaneBendForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaPiTorsionForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaPiTorsionForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaStretchBendForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaStretchBendForce.cpp
--- a/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaTorsionTorsionForce.cpp
+++ b/plugins/amoeba/platforms/reference/tests/TestReferenceAmoebaTorsionTorsionForce.cpp
--- a/plugins/amoeba/serialization/src/AmoebaAngleForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaAngleForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaBondForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaBondForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaGeneralizedKirkwoodForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaGeneralizedKirkwoodForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaInPlaneAngleForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaInPlaneAngleForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaMultipoleForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaMultipoleForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaOutOfPlaneBendForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaOutOfPlaneBendForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaPiTorsionForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaPiTorsionForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaStretchBendForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaStretchBendForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaTorsionTorsionForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaTorsionTorsionForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaVdwForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaVdwForceProxy.cpp
--- a/plugins/amoeba/serialization/src/AmoebaWcaDispersionForceProxy.cpp
+++ b/plugins/amoeba/serialization/src/AmoebaWcaDispersionForceProxy.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaAngleForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaAngleForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaBondForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaBondForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaGeneralizedKirkwoodForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaGeneralizedKirkwoodForce.cpp
--- a/plugins/amoeba/serialization/tests/TestSerializeAmoebaInPlaneAngleForce.cpp
+++ b/plugins/amoeba/serialization/tests/TestSerializeAmoebaInPlaneAngleForce.cpp