Merge branch 'release/60' into develop
Bumped version for development after release.
Upgraded version of fenix to 3.3.2
Bumped version for release of 61
Merge branch 'release/61'