Merge branch 'release/25' into develop
Bumped version for development after release.
Bumped version for release of 26
Upgraded version of fenix to 2.1.7. Upgraded version of fenix-ist to 1.0.8
Merge branch 'release/26'