cancel button available now on edit mode
Merge branch '2.3.x' of https://github.com/ffgarciam/social into 2.3.x