updated conditions
Merge branch 'dev' of https://github.com/avalanche-canada/ac-web into dev

* 'dev' of https://github.com/avalanche-canada/ac-web:
  adds fx layer on/off