Bumped version for release of 1.0.4
Upgraded version of fenix to 2.1.2
Merge branch 'release/1.0.4' into develop
Bumped version for development after release