Merge branch 'hotfix/47'
Bumped version for release of 48
Upgraded version of fenix to 2.2.5
Merged hotfix 48 back onto develop.