Merge branch 'release/36' into develop
Bumped version for development after release.
Upgraded version fenix to 2.1.16.
Bumped version for release of 37
Merge branch 'release/37'