Merge branch 'release/v2.5.0.2' into develop
pointed gitmodules to new path
bumped up version number to v2.5.0.3
Merge branch 'release/v2.5.0.3'