edit image in property
Merge branch 'master' of https://github.com/pablotandil/joinajoin