Bumped version for release of 48
Upgraded version of fenix to 2.2.5
Merge branch 'hotfix/48'