Fix Cover conflict with edit profile
Merge branch 'master' of https://github.com/ggueno/projecteel