Updated version of fenix to 2.0.4
Bumped version for release of 15
Merge branch 'release/15' into develop
Bumped version for develop after release.