Fixing bug on edit journey
Merge branch 'master' of github.com:clocklimited/Catfish
Merge branch 'master' of github.com:clocklimited/Catfish