update order as temporary workaround for iOS issue
better fusing photo
Merge branch 'master' into gh-pages